diff --git a/t/slubsipbuilderbagit.t b/t/slubsipbuilderbagit.t
index 7d7217b2fb7cbd94c0f042b51cc18c7f3274222f..9f38643d34f3e8f51a3a96c41316d1ba59686b6f 100644
--- a/t/slubsipbuilderbagit.t
+++ b/t/slubsipbuilderbagit.t
@@ -222,30 +222,30 @@ is(-d $output_dir, 1, "createDir(\$path) path is directory");
 is(-e $output_dir, 1, "createDir(\$path) directory exists in path $output_dir");
 #
 my $output_metaPath = $output_path->child("dir")->child("meta");
-my $output_modsFilePath = $output_metaPath->child("mods.xml");  # auto generated in copyFilesToMeta()
+my $output_marc21FilePath = $output_metaPath->child("marc21.xml");  # auto generated in copyFilesToMeta()
 my $output_rightsFilePath = $output_metaPath->child("rights.xml");
 my $output_lidoFilePath = $output_metaPath->child("lido.xml");
 my $output_bubbleFilePath = $output_metaPath->child("bubble.xml");
-my $output_sameModsFilePath = $output_metaPath->child("1.xml");
+my $output_sameMarc21FilePath = $output_metaPath->child("1.xml");
 my $output_sameRightsFilePath = $output_metaPath->child("2.xml");
 my $input_metaPath = path(__FILE__)->parent->parent->child('export_dir_kitodo')->child('bagit')->child("meta");
-my $input_modsFilePath = $input_metaPath->child("mods.xml");
+my $input_marc21FilePath = $input_metaPath->child("marc21.xml");
 my $input_rightsFilePath = $input_metaPath->child("rights.xml");
 my $input_lidoFilePath = $input_metaPath->child("lido.xml");
 my $input_bubbleFilePath = $input_metaPath->child("bubble.xml");
-my @input_addMetaFile = ($input_lidoFilePath, $input_bubbleFilePath, $input_modsFilePath, $input_rightsFilePath);
+my @input_addMetaFile = ($input_lidoFilePath, $input_bubbleFilePath, $input_marc21FilePath, $input_rightsFilePath);
 SLUB::LZA::SIPBuilderBagIt::createDir($output_metaPath);
-SLUB::LZA::SIPBuilderBagIt::copyFilesToMeta($ppn, $noppn, $output_metaPath, $input_rightsFilePath, \@input_addMetaFile, $mods);
-is(-f $output_modsFilePath, 1, "copyFilesToMeta() file $output_modsFilePath exists.");
+SLUB::LZA::SIPBuilderBagIt::copyFilesToMeta($ppn, $output_metaPath, $input_rightsFilePath, \@input_addMetaFile, $marc21);
+is(-f $output_marc21FilePath, 1, "copyFilesToMeta() file $output_marc21FilePath exists.");
 is(-f $output_rightsFilePath, 1, "copyFilesToMeta() file $output_rightsFilePath exists.");
 is(-f $output_lidoFilePath, 1, "copyFilesToMeta() file $output_lidoFilePath exists.");
 is(-f $output_bubbleFilePath, 1, "copyFilesToMeta() file $output_bubbleFilePath exists.");
-is(-f $output_sameModsFilePath, 1, "copyFilesToMeta() file $output_sameModsFilePath exists. Renamed self included mods.xml");
+is(-f $output_sameMarc21FilePath, 1, "copyFilesToMeta() file $output_sameMarc21FilePath exists. Renamed self included marc21.xml");
 is(-f $output_sameRightsFilePath, 1, "copyFilesToMeta() file $output_sameRightsFilePath exists. Renamed self included rights.xml");
 is(equalFilesByIgnoringCRLF_LF($output_rightsFilePath, $input_rightsFilePath), 1, "copyFilesToMeta() file $input_rightsFilePath is identical to $output_rightsFilePath");
 is(equalFilesByIgnoringCRLF_LF($output_lidoFilePath, $input_lidoFilePath), 1, "copyFilesToMeta() file $input_lidoFilePath is identical to $output_lidoFilePath");
 is(equalFilesByIgnoringCRLF_LF($output_bubbleFilePath, $input_bubbleFilePath), 1, "copyFilesToMeta() file $input_bubbleFilePath is identical to $output_bubbleFilePath");
-is(equalFilesByIgnoringCRLF_LF($output_sameModsFilePath, $input_modsFilePath), 1, "copyFilesToMeta() file $input_modsFilePath is identical to $output_sameModsFilePath");
+is(equalFilesByIgnoringCRLF_LF($output_sameMarc21FilePath, $input_marc21FilePath), 1, "copyFilesToMeta() file $input_marc21FilePath is identical to $output_sameMarc21FilePath");
 is(equalFilesByIgnoringCRLF_LF($output_sameRightsFilePath, $input_rightsFilePath), 1, "copyFilesToMeta() file $input_rightsFilePath is identical to $output_sameRightsFilePath");
 #
 my $xsdName = "rights1.xsd";
@@ -269,7 +269,7 @@ is(SLUB::LZA::SIPBuilderBagIt::validateRightsXML($input_rights . "/Fallbeispiel-
 is(SLUB::LZA::SIPBuilderBagIt::validateRightsXML($input_rightsFilePath, $xsdName), 1, "validateRightsXML() meta/rights.xml according to $xsdName");
 throws_ok{ SLUB::LZA::SIPBuilderBagIt::validateRightsXML(undef, $xsdName); } qr/rightsFilePath not defined/, "validateRightsXML(\$rightsFilePath, \$xsdName), metaPath undef";
 throws_ok{ SLUB::LZA::SIPBuilderBagIt::validateRightsXML($input_rightsFilePath, undef); } qr/xsd name not defined/, "validateRightsXML(\$rightsFilePath, \$xsdName), xsdName undef";
-throws_ok{ SLUB::LZA::SIPBuilderBagIt::validateRightsXML($input_metaPath . "/mods.xml", $xsdName); } qr/failed validation/, "validateRightsXML(\$rightsFilePath, \$xsdName), rights.xml is not valid according to $xsdName";
+throws_ok{ SLUB::LZA::SIPBuilderBagIt::validateRightsXML($input_metaPath . "/marc21.xml", $xsdName); } qr/failed validation/, "validateRightsXML(\$rightsFilePath, \$xsdName), rights.xml is not valid according to $xsdName";
 #
 my $system_prefix = 'lin_';
 if($^O eq 'MSWin32'){ $system_prefix = 'win_'; }
@@ -287,7 +287,7 @@ SLUB::LZA::SIPBuilderBagIt::createDir($bag_output_path);
 SLUB::LZA::SIPBuilderBagIt::createDir($data_output_path);
 File::Copy::Recursive::dircopy($ie_input_path, $data_output_path) or die "Could not perform dircopy() of $ie_input_path to autogenerated $data_output_path: $!";
 SLUB::LZA::SIPBuilderBagIt::createDir($meta_output_path);
-SLUB::LZA::SIPBuilderBagIt::copyFilesToMeta($ppn, $noppn, $meta_output_path, $input_rightsFilePath, \@addMetaFile, $mods);
+SLUB::LZA::SIPBuilderBagIt::copyFilesToMeta($ppn, $meta_output_path, $input_rightsFilePath, \@addMetaFile, $marc21);
 
 ok(SLUB::LZA::SIPBuilderBagIt::create_slub_bagit($bag_output_path, \@addBagInfo), "create_slub_bagit()");
 throws_ok{ SLUB::LZA::SIPBuilderBagIt::create_slub_bagit(undef, \@addBagInfo); } qr/bagPath is not defined/, "create_slub_bagit(\$bagPath, \$refAddBagInfo), bagPath undef";
@@ -300,7 +300,7 @@ workaroundTagmanifest($bag_output_path . '/tagmanifest-md5.txt', 'xxxxxxxxxxxxxx
 workaroundTagmanifest($bag_output_path . '/tagmanifest-sha512.txt', 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx', 'bag-info.txt');
 
 is(equalFilesByIgnoringCRLF_LF($bag_output_path . '/data/00000001.tif', $valid_bag_path . '/data/00000001.tif'), 1, "create_slub_bagit() $bag: validate data/00000001.tif");
-is(equalFilesByIgnoringCRLF_LF($bag_output_path . '/meta/mods.xml', $valid_bag_path . '/meta/mods.xml'), 1, "create_slub_bagit() $bag: validate meta/mods.xml");
+is(equalFilesByIgnoringCRLF_LF($bag_output_path . '/meta/marc21.xml', $valid_bag_path . '/meta/marc21.xml'), 1, "create_slub_bagit() $bag: validate meta/marc21.xml");
 is(equalFilesByIgnoringCRLF_LF($bag_output_path . '/meta/rights.xml', $valid_bag_path . '/meta/rights.xml'), 1, "create_slub_bagit() $bag: validate meta/rights.xml");
 is(equalFilesByIgnoringCRLF_LF($bag_output_path . '/bag-info.txt', $valid_bag_path . '/bag-info.txt'), 1, "create_slub_bagit() $bag: validate bag-info.txt"); # workaround
 is(equalFilesByIgnoringCRLF_LF($bag_output_path . '/bagit.txt', $valid_bag_path . '/bagit.txt'), 1, "create_slub_bagit() $bag: validate bagit.txt");
@@ -328,7 +328,7 @@ workaroundTagmanifest($bag_output_path . '/tagmanifest-sha512.txt', 'xxxxxxxxxxx
 is(equalFilesByIgnoringCRLF_LF($bag_output_path . '/data/scans_tif/00000001.tif', $valid_bag_path . '/data/scans_tif/00000001.tif'), 1, "create_slub_bagit() $bag: validate data/scans_tif/00000001.tif");
 is(equalFilesByIgnoringCRLF_LF($bag_output_path . '/data/scans_tif/00000002.tif', $valid_bag_path . '/data/scans_tif/00000002.tif'), 1, "create_slub_bagit() $bag: validate data/scans_tif/00000002.tif");
 is(equalFilesByIgnoringCRLF_LF($bag_output_path . '/data/test.tiff', $valid_bag_path . '/data/test.tiff'), 1, "create_slub_bagit() $bag: validate data/test.tiff");
-is(equalFilesByIgnoringCRLF_LF($bag_output_path . '/meta/mods.xml', $valid_bag_path . '/meta/mods.xml'), 1, "create_slub_bagit() $bag: validate meta/mods.xml");
+is(equalFilesByIgnoringCRLF_LF($bag_output_path . '/meta/marc21.xml', $valid_bag_path . '/meta/marc21.xml'), 1, "create_slub_bagit() $bag: validate meta/marc21.xml");
 is(equalFilesByIgnoringCRLF_LF($bag_output_path . '/meta/rights.xml', $valid_bag_path . '/meta/rights.xml'), 1, "create_slub_bagit() $bag: validate meta/rights.xml");
 is(equalFilesByIgnoringCRLF_LF($bag_output_path . '/bag-info.txt', $valid_bag_path . '/bag-info.txt'), 1, "create_slub_bagit() $bag: validate bag-info.txt"); # workaround
 is(equalFilesByIgnoringCRLF_LF($bag_output_path . '/bagit.txt', $valid_bag_path . '/bagit.txt'), 1, "create_slub_bagit() $bag: validate bagit.txt");
@@ -359,7 +359,7 @@ workaroundTagmanifest($bag_output_path . '/tagmanifest-sha512.txt', 'xxxxxxxxxxx
 is(equalFilesByIgnoringCRLF_LF($bag_output_path . '/data/img/scans_tif/00000001.tif', $valid_bag_path . '/data/img/scans_tif/00000001.tif'), 1, "create_slub_bagit() $bag: validate data/img/scans_tif/00000001.tif");
 is(equalFilesByIgnoringCRLF_LF($bag_output_path . '/data/img/scans_tif/00000002.tif', $valid_bag_path . '/data/img/scans_tif/00000002.tif'), 1, "create_slub_bagit() $bag: validate data/img/scans_tif/00000002.tif");
 is(equalFilesByIgnoringCRLF_LF($bag_output_path . '/data/test.tiff', $valid_bag_path . '/data/test.tiff'), 1, "create_slub_bagit() $bag: validate data/test.tiff");
-is(equalFilesByIgnoringCRLF_LF($bag_output_path . '/meta/mods.xml', $valid_bag_path . '/meta/mods.xml'), 1, "create_slub_bagit() $bag: validate meta/mods.xml");
+is(equalFilesByIgnoringCRLF_LF($bag_output_path . '/meta/marc21.xml', $valid_bag_path . '/meta/marc21.xml'), 1, "create_slub_bagit() $bag: validate meta/marc21.xml");
 is(equalFilesByIgnoringCRLF_LF($bag_output_path . '/meta/rights.xml', $valid_bag_path . '/meta/rights.xml'), 1, "create_slub_bagit() $bag: validate meta/rights.xml");
 is(equalFilesByIgnoringCRLF_LF($bag_output_path . '/bag-info.txt', $valid_bag_path . '/bag-info.txt'), 1, "create_slub_bagit() $bag: validate bag-info.txt"); # workaround
 is(equalFilesByIgnoringCRLF_LF($bag_output_path . '/bagit.txt', $valid_bag_path . '/bagit.txt'), 1, "create_slub_bagit() $bag: validate bagit.txt");
@@ -389,7 +389,7 @@ workaroundTagmanifest($bag_output_path . '/tagmanifest-sha512.txt', 'xxxxxxxxxxx
 
 is(equalFilesByIgnoringCRLF_LF($bag_output_path . '/data/dir_test_äöüÄÖÜß/00000001.tif', $valid_bag_path . '/data/dir_test_äöüÄÖÜß/00000001.tif'), 1, "create_slub_bagit() $bag: validate data/dir_test_äöüÄÖÜß/00000001.tif");
 is(equalFilesByIgnoringCRLF_LF($bag_output_path . '/data/test_äöüÄÖÜß.tiff', $valid_bag_path . '/data/test_äöüÄÖÜß.tiff'), 1, "create_slub_bagit() $bag: validate data/test_äöüÄÖÜß.tiff");
-is(equalFilesByIgnoringCRLF_LF($bag_output_path . '/meta/mods.xml', $valid_bag_path . '/meta/mods.xml'), 1, "create_slub_bagit() $bag: validate meta/mods.xml");
+is(equalFilesByIgnoringCRLF_LF($bag_output_path . '/meta/marc21.xml', $valid_bag_path . '/meta/marc21.xml'), 1, "create_slub_bagit() $bag: validate meta/marc21.xml");
 is(equalFilesByIgnoringCRLF_LF($bag_output_path . '/meta/rights.xml', $valid_bag_path . '/meta/rights.xml'), 1, "create_slub_bagit() $bag: validate meta/rights.xml");
 is(equalFilesByIgnoringCRLF_LF($bag_output_path . '/bag-info.txt', $valid_bag_path . '/bag-info.txt'), 1, "create_slub_bagit() $bag: validate bag-info.txt"); # workaround
 is(equalFilesByIgnoringCRLF_LF($bag_output_path . '/bagit.txt', $valid_bag_path . '/bagit.txt'), 1, "create_slub_bagit() $bag: validate bagit.txt");