diff --git a/.github/workflows/el6.yml b/.github/workflows/el6.yml
index 9a2f80f..ecf8aa4 100644
--- a/.github/workflows/el6.yml
+++ b/.github/workflows/el6.yml
@@ -116,8 +116,8 @@ jobs:
             | tr -d ' ')
           # git safe.directory was added in git 2.35.2; ignore errors on older git.
           git config --global --add safe.directory "$(pwd)" 2>/dev/null || true
-          git archive --prefix="Xnee-${XNEE_VERSION}/" HEAD \
-            | gzip > "Xnee-${XNEE_VERSION}.tar.gz"
+          git archive --prefix="xnee-${XNEE_VERSION}/" HEAD \
+            | gzip > "xnee-${XNEE_VERSION}.tar.gz"
 
       - name: Build RPM inside CentOS 6 container
         run: |
@@ -147,7 +147,7 @@ jobs:
               | awk 'BEGIN {FS=","} { print $2 }' | tr -d ' ')
           XNEE_RELEASE=1
           mkdir -p "$HOME/rpmbuild"/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
-          cp "Xnee-${XNEE_VERSION}.tar.gz" "$HOME/rpmbuild/SOURCES/"
+          cp "xnee-${XNEE_VERSION}.tar.gz" "$HOME/rpmbuild/SOURCES/"
           sed \
               -e "s/XNEE_VERSION/${XNEE_VERSION}/g" \
               -e "s/XNEE_RELEASE/${XNEE_RELEASE}/g" \
diff --git a/.github/workflows/el8.yml b/.github/workflows/el8.yml
index 6696a62..925c62d 100644
--- a/.github/workflows/el8.yml
+++ b/.github/workflows/el8.yml
@@ -61,8 +61,8 @@ jobs:
           git config --global --add safe.directory "$(pwd)"
           # Use git archive to avoid the doc/Makefile.am dia→png generation
           # that make dist triggers even with --disable-doc.
-          git archive --prefix="Xnee-${XNEE_VERSION}/" HEAD \
-            | gzip > "Xnee-${XNEE_VERSION}.tar.gz"
+          git archive --prefix="xnee-${XNEE_VERSION}/" HEAD \
+            | gzip > "xnee-${XNEE_VERSION}.tar.gz"
 
       - name: Build RPM package
         run: |
@@ -73,7 +73,7 @@ jobs:
 
           mkdir -p "$HOME/rpmbuild"/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
 
-          cp "Xnee-${XNEE_VERSION}.tar.gz" "$HOME/rpmbuild/SOURCES/"
+          cp "xnee-${XNEE_VERSION}.tar.gz" "$HOME/rpmbuild/SOURCES/"
 
           sed \
             -e "s/XNEE_VERSION/${XNEE_VERSION}/g" \
diff --git a/build/SPECS/cnee-el6.spec b/build/SPECS/cnee-el6.spec
index 3d3af89..40d9965 100644
--- a/build/SPECS/cnee-el6.spec
+++ b/build/SPECS/cnee-el6.spec
@@ -1,4 +1,4 @@
-%define packname        Xnee
+%define packname        xnee
 %define cliname         cnee
 
 Name:           %{cliname}
@@ -6,11 +6,7 @@ Version:        XNEE_VERSION
 Release:        XNEE_RELEASE%{?dist}
 Summary:        X11 event recorder, replayer and distributor (command line tool)
 
-# NOTE: The COPYING file in this package contains the GNU General Public
-# License version 3 (GPLv3). The License tag below reflects the original
-# upstream project packaging convention and has not been updated to GPLv3+
-# to avoid unintended changes to distributed package metadata.
-License:        GPLv2+
+License:        GPLv3+
 URL:            https://www.gnu.org/software/xnee
 Source0:        https://ftp.gnu.org/pub/gnu/xnee/%{packname}-%{version}.tar.gz
 
diff --git a/build/SPECS/cnee-el8.spec b/build/SPECS/cnee-el8.spec
index 0ccd30c..fbb12cc 100644
--- a/build/SPECS/cnee-el8.spec
+++ b/build/SPECS/cnee-el8.spec
@@ -1,4 +1,4 @@
-%define packname        Xnee
+%define packname        xnee
 %define cliname         cnee
 
 Name:           %{cliname}
@@ -6,11 +6,7 @@ Version:        XNEE_VERSION
 Release:        XNEE_RELEASE%{?dist}
 Summary:        X11 event recorder, replayer and distributor (command line tool)
 
-# NOTE: The COPYING file in this package contains the GNU General Public
-# License version 3 (GPLv3). The License tag below reflects the original
-# upstream project packaging convention and has not been updated to GPL-3.0-or-later
-# to avoid unintended changes to distributed package metadata.
-License:        GPL-2.0-or-later
+License:        GPL-3.0-or-later
 URL:            https://www.gnu.org/software/xnee
 Source0:        https://ftp.gnu.org/pub/gnu/xnee/%{packname}-%{version}.tar.gz
 
diff --git a/tests/e2e_cnee.sh b/tests/e2e_cnee.sh
index 2f69575..ee061d1 100755
--- a/tests/e2e_cnee.sh
+++ b/tests/e2e_cnee.sh
@@ -77,7 +77,7 @@ assert_output_contains() {
     if echo "$_out" | grep -Eq "$_ere_pat"; then
         pass "$_desc"
     else
-        fail "$_desc" "output matching '$_ere_pat'" "$(echo "$_out" | head -3)"
+        fail "$_desc" "output matching '$_ere_pat'" "$(echo "$_out" | head -n 3)"
     fi
 }
 
@@ -446,7 +446,7 @@ else
             pass "cnee --replay connects to virtual display successfully"
         else
             fail "cnee --replay connects to virtual display successfully" \
-                "no display error" "$(head -3 "$REPLAY_STDERR")"
+                "no display error" "$(head -n 3 "$REPLAY_STDERR")"
         fi
 
         kill "$XVFB_PID" 2>/dev/null