diff --git a/Lib/test/test_zipfile/test_core.py b/Lib/test/test_zipfile/test_core.py
index bbd62804b61..26081a86015 100644
--- a/Lib/test/test_zipfile/test_core.py
+++ b/Lib/test/test_zipfile/test_core.py
@@ -1391,8 +1391,8 @@ def _prepare_zip_from_test_files(self, zfname, test_files, force_zip64=False):
 
 class AbstractRemoveTests(RepackHelperMixin):
     @classmethod
-    def setUpClass(self):
-        self.test_files = [
+    def setUpClass(cls):
+        cls.test_files = [
             ('file0.txt', b'Lorem ipsum dolor sit amet, consectetur adipiscing elit'),
             ('file1.txt', b'Duis aute irure dolor in reprehenderit in voluptate velit esse'),
             ('file2.txt', b'Sed ut perspiciatis unde omnis iste natus error sit voluptatem'),
@@ -1682,8 +1682,8 @@ class ZstdRemoveTests(AbstractRemoveTests, unittest.TestCase):
 
 class AbstractRepackTests(RepackHelperMixin):
     @classmethod
-    def setUpClass(self):
-        self.test_files = [
+    def setUpClass(cls):
+        cls.test_files = [
             ('file0.txt', b'Lorem ipsum dolor sit amet, consectetur adipiscing elit'),
             ('file1.txt', b'Duis aute irure dolor in reprehenderit in voluptate velit esse'),
             ('file2.txt', b'Sed ut perspiciatis unde omnis iste natus error sit voluptatem'),
diff --git a/Lib/zipfile/__init__.py b/Lib/zipfile/__init__.py
index e23ed0809e8..9be6e862c97 100644
--- a/Lib/zipfile/__init__.py
+++ b/Lib/zipfile/__init__.py
@@ -1498,7 +1498,7 @@ def repack(self, zfile, removed=None):
             if zinfo in removed_zinfos:
                 old_header_offset = zinfo.header_offset
                 zinfo.header_offset -= entry_offset
-                self._move_entry_data(
+                self._copy_bytes(
                     fp,
                     old_header_offset + used_entry_size,
                     zinfo.header_offset,
@@ -1515,7 +1515,7 @@ def repack(self, zfile, removed=None):
                 if entry_offset > 0:
                     old_header_offset = zinfo.header_offset
                     zinfo.header_offset -= entry_offset
-                    self._move_entry_data(fp, old_header_offset, zinfo.header_offset, used_entry_size)
+                    self._copy_bytes(fp, old_header_offset, zinfo.header_offset, used_entry_size)
 
                 if zinfo._end_offset is not None:
                     zinfo._end_offset = zinfo.header_offset + used_entry_size
@@ -1731,7 +1731,7 @@ def _calc_local_file_entry_size(self, fp, zinfo):
             dd_size
         )
 
-    def _move_entry_data(self, fp, old_offset, new_offset, size):
+    def _copy_bytes(self, fp, old_offset, new_offset, size):
         read_size = 0
         while read_size < size:
             fp.seek(old_offset + read_size)