diff --git a/app/Elements/Gedcom.php b/app/Elements/GedcomElement.php
similarity index 95%
rename from app/Elements/Gedcom.php
rename to app/Elements/GedcomElement.php
index a1071a994ce..2f645351cb5 100644
--- a/app/Elements/Gedcom.php
+++ b/app/Elements/GedcomElement.php
@@ -22,6 +22,6 @@
 /**
  * HEAD:GEDC is an empty element with children; VERS and FORM.
  */
-class Gedcom extends EmptyElement
+class GedcomElement extends EmptyElement
 {
 }
diff --git a/app/Factories/ElementFactory.php b/app/Factories/ElementFactory.php
index 23dc04d261f..293ffe27acf 100644
--- a/app/Factories/ElementFactory.php
+++ b/app/Factories/ElementFactory.php
@@ -85,7 +85,7 @@
 use Fisharebest\Webtrees\Elements\FileName;
 use Fisharebest\Webtrees\Elements\FirstCommunion;
 use Fisharebest\Webtrees\Elements\Form;
-use Fisharebest\Webtrees\Elements\Gedcom;
+use Fisharebest\Webtrees\Elements\GedcomElement;
 use Fisharebest\Webtrees\Elements\GenerationsOfAncestors;
 use Fisharebest\Webtrees\Elements\GenerationsOfDescendants;
 use Fisharebest\Webtrees\Elements\GovIdentifier;
@@ -348,7 +348,7 @@ private function elements(): array
                 'HEAD:DATE:TIME'           => new TimeValue(I18N::translate('Time')),
                 'HEAD:DEST'                => new ReceivingSystemName(I18N::translate('Destination')),
                 'HEAD:FILE'                => new FileName(I18N::translate('Filename')),
-                'HEAD:GEDC'                => new Gedcom(I18N::translate('GEDCOM')),
+                'HEAD:GEDC'                => new GedcomElement(I18N::translate('GEDCOM')),
                 'HEAD:GEDC:FORM'           => new Form(I18N::translate('Format')),
                 'HEAD:GEDC:VERS'           => new VersionNumber(I18N::translate('Version')),
                 'HEAD:LANG'                => new LanguageId(I18N::translate('Language')),
diff --git a/tests/app/Elements/GedcomTest.php b/tests/app/Elements/GedcomElementTest.php
similarity index 86%
rename from tests/app/Elements/GedcomTest.php
rename to tests/app/Elements/GedcomElementTest.php
index 05066dd4c4f..422e2917130 100644
--- a/tests/app/Elements/GedcomTest.php
+++ b/tests/app/Elements/GedcomElementTest.php
@@ -23,9 +23,9 @@
  * Test harness for the class Gedcom
  *
  * @covers \Fisharebest\Webtrees\Elements\AbstractElement
- * @covers \Fisharebest\Webtrees\Elements\Gedcom
+ * @covers \Fisharebest\Webtrees\Elements\GedcomElement
  */
-class GedcomTest extends AbstractElementTest
+class GedcomElementTest extends AbstractElementTest
 {
     /**
      * Standard tests for all elements.
@@ -34,6 +34,6 @@ public static function setupBeforeClass(): void
     {
         parent::setUpBeforeClass();
 
-        self::$element = new Gedcom('label');
+        self::$element = new GedcomElement('label');
     }
 }