Prefer uppercase for NameType fields. See #4308

9 files changed, 114 insertions, 114 deletions

diff --git a/tests/app/SurnameTradition/DefaultSurnameTraditionTest.php b/tests/app/SurnameTradition/DefaultSurnameTraditionTest.php
index 4f1d948dff..78cc16c4c8 100644
--- a/tests/app/SurnameTradition/DefaultSurnameTraditionTest.php
+++ b/tests/app/SurnameTradition/DefaultSurnameTraditionTest.php
@@ -65,17 +65,17 @@ class DefaultSurnameTraditionTest extends TestCase
         $mother->method('facts')->willReturn(new Collection([$mother_fact]));
 
         self::assertSame(
-            ["1 NAME //\n2 TYPE birth"],
+            ["1 NAME //\n2 TYPE BIRTH"],
             $this->surname_tradition->newChildNames($father, $mother, 'M')
         );
 
         self::assertSame(
-            ["1 NAME //\n2 TYPE birth"],
+            ["1 NAME //\n2 TYPE BIRTH"],
             $this->surname_tradition->newChildNames($father, $mother, 'F')
         );
 
         self::assertSame(
-            ["1 NAME //\n2 TYPE birth"],
+            ["1 NAME //\n2 TYPE BIRTH"],
             $this->surname_tradition->newChildNames($father, $mother, 'U')
         );
     }
@@ -96,17 +96,17 @@ class DefaultSurnameTraditionTest extends TestCase
         $individual->method('facts')->willReturn(new Collection([$fact]));
 
         self::assertSame(
-            ["1 NAME //\n2 TYPE birth"],
+            ["1 NAME //\n2 TYPE BIRTH"],
             $this->surname_tradition->newParentNames($individual, 'M')
         );
 
         self::assertSame(
-            ["1 NAME //\n2 TYPE birth"],
+            ["1 NAME //\n2 TYPE BIRTH"],
             $this->surname_tradition->newParentNames($individual, 'F')
         );
 
         self::assertSame(
-            ["1 NAME //\n2 TYPE birth"],
+            ["1 NAME //\n2 TYPE BIRTH"],
             $this->surname_tradition->newParentNames($individual, 'U')
         );
     }
@@ -127,17 +127,17 @@ class DefaultSurnameTraditionTest extends TestCase
         $individual->method('facts')->willReturn(new Collection([$fact]));
 
         self::assertSame(
-            ["1 NAME //\n2 TYPE birth"],
+            ["1 NAME //\n2 TYPE BIRTH"],
             $this->surname_tradition->newSpouseNames($individual, 'M')
         );
 
         self::assertSame(
-            ["1 NAME //\n2 TYPE birth"],
+            ["1 NAME //\n2 TYPE BIRTH"],
             $this->surname_tradition->newSpouseNames($individual, 'F')
         );
 
         self::assertSame(
-            ["1 NAME //\n2 TYPE birth"],
+            ["1 NAME //\n2 TYPE BIRTH"],
             $this->surname_tradition->newSpouseNames($individual, 'U')
         );
     }
diff --git a/tests/app/SurnameTradition/IcelandicSurnameTraditionTest.php b/tests/app/SurnameTradition/IcelandicSurnameTraditionTest.php
index ffab7f86ef..7884079d1f 100644
--- a/tests/app/SurnameTradition/IcelandicSurnameTraditionTest.php
+++ b/tests/app/SurnameTradition/IcelandicSurnameTraditionTest.php
@@ -65,7 +65,7 @@ class IcelandicSurnameTraditionTest extends TestCase
         $mother->method('facts')->willReturn(new Collection([$mother_fact]));
 
         self::assertSame(
-            ["1 NAME Jonsson\n2 TYPE birth\n2 GIVN Jonsson"],
+            ["1 NAME Jonsson\n2 TYPE BIRTH\n2 GIVN Jonsson"],
             $this->surname_tradition->newChildNames($father, $mother, 'M')
         );
     }
@@ -92,7 +92,7 @@ class IcelandicSurnameTraditionTest extends TestCase
         $mother->method('facts')->willReturn(new Collection([$mother_fact]));
 
         self::assertSame(
-            ["1 NAME Jonsdottir\n2 TYPE birth\n2 GIVN Jonsdottir"],
+            ["1 NAME Jonsdottir\n2 TYPE BIRTH\n2 GIVN Jonsdottir"],
             $this->surname_tradition->newChildNames($father, $mother, 'F')
         );
     }
@@ -119,7 +119,7 @@ class IcelandicSurnameTraditionTest extends TestCase
         $mother->method('facts')->willReturn(new Collection([$mother_fact]));
 
         self::assertSame(
-            ["1 NAME\n2 TYPE birth"],
+            ["1 NAME\n2 TYPE BIRTH"],
             $this->surname_tradition->newChildNames($father, $mother, 'U')
         );
     }
@@ -140,7 +140,7 @@ class IcelandicSurnameTraditionTest extends TestCase
         $individual->method('facts')->willReturn(new Collection([$fact]));
 
         self::assertSame(
-            ["1 NAME Einar\n2 TYPE birth\n2 GIVN Einar"],
+            ["1 NAME Einar\n2 TYPE BIRTH\n2 GIVN Einar"],
             $this->surname_tradition->newParentNames($individual, 'M')
         );
     }
@@ -161,7 +161,7 @@ class IcelandicSurnameTraditionTest extends TestCase
         $individual->method('facts')->willReturn(new Collection([$fact]));
 
         self::assertSame(
-            ["1 NAME Eva\n2 TYPE birth\n2 GIVN Eva"],
+            ["1 NAME Eva\n2 TYPE BIRTH\n2 GIVN Eva"],
             $this->surname_tradition->newParentNames($individual, 'F')
         );
     }
@@ -182,7 +182,7 @@ class IcelandicSurnameTraditionTest extends TestCase
         $individual->method('facts')->willReturn(new Collection([$fact]));
 
         self::assertSame(
-            ["1 NAME\n2 TYPE birth"],
+            ["1 NAME\n2 TYPE BIRTH"],
             $this->surname_tradition->newParentNames($individual, 'U')
         );
     }
@@ -203,17 +203,17 @@ class IcelandicSurnameTraditionTest extends TestCase
         $individual->method('facts')->willReturn(new Collection([$fact]));
 
         self::assertSame(
-            ["1 NAME\n2 TYPE birth"],
+            ["1 NAME\n2 TYPE BIRTH"],
             $this->surname_tradition->newSpouseNames($individual, 'M')
         );
 
         self::assertSame(
-            ["1 NAME\n2 TYPE birth"],
+            ["1 NAME\n2 TYPE BIRTH"],
             $this->surname_tradition->newSpouseNames($individual, 'F')
         );
 
         self::assertSame(
-            ["1 NAME\n2 TYPE birth"],
+            ["1 NAME\n2 TYPE BIRTH"],
             $this->surname_tradition->newSpouseNames($individual, 'U')
         );
     }
diff --git a/tests/app/SurnameTradition/LithuanianSurnameTraditionTest.php b/tests/app/SurnameTradition/LithuanianSurnameTraditionTest.php
index e052bb18e5..3237c6d2fe 100644
--- a/tests/app/SurnameTradition/LithuanianSurnameTraditionTest.php
+++ b/tests/app/SurnameTradition/LithuanianSurnameTraditionTest.php
@@ -79,7 +79,7 @@ class LithuanianSurnameTraditionTest extends TestCase
         $mother->method('facts')->willReturn(new Collection([$mother_fact]));
 
         self::assertSame(
-            ["1 NAME /White/\n2 TYPE birth\n2 SURN White"],
+            ["1 NAME /White/\n2 TYPE BIRTH\n2 SURN White"],
             $this->surname_tradition->newChildNames($father, $mother, 'M')
         );
     }
@@ -107,7 +107,7 @@ class LithuanianSurnameTraditionTest extends TestCase
         $mother->method('facts')->willReturn(new Collection([$mother_fact]));
 
         self::assertSame(
-            ["1 NAME /White/\n2 TYPE birth\n2 SURN White"],
+            ["1 NAME /White/\n2 TYPE BIRTH\n2 SURN White"],
             $this->surname_tradition->newChildNames($father, $mother, 'F')
         );
     }
@@ -135,7 +135,7 @@ class LithuanianSurnameTraditionTest extends TestCase
         $mother->method('facts')->willReturn(new Collection([$mother_fact]));
 
         self::assertSame(
-            ["1 NAME /Whitaitė/\n2 TYPE birth\n2 SURN Whita"],
+            ["1 NAME /Whitaitė/\n2 TYPE BIRTH\n2 SURN Whita"],
             $this->surname_tradition->newChildNames($father, $mother, 'F')
         );
 
@@ -146,7 +146,7 @@ class LithuanianSurnameTraditionTest extends TestCase
         $father->method('facts')->willReturn(new Collection([$father_fact]));
 
         self::assertSame(
-            ["1 NAME /Whitaitė/\n2 TYPE birth\n2 SURN Whitas"],
+            ["1 NAME /Whitaitė/\n2 TYPE BIRTH\n2 SURN Whitas"],
             $this->surname_tradition->newChildNames($father, $mother, 'F')
         );
 
@@ -157,7 +157,7 @@ class LithuanianSurnameTraditionTest extends TestCase
         $father->method('facts')->willReturn(new Collection([$father_fact]));
 
         self::assertSame(
-            ["1 NAME /Whitytė/\n2 TYPE birth\n2 SURN Whitis"],
+            ["1 NAME /Whitytė/\n2 TYPE BIRTH\n2 SURN Whitis"],
             $this->surname_tradition->newChildNames($father, $mother, 'F')
         );
 
@@ -168,7 +168,7 @@ class LithuanianSurnameTraditionTest extends TestCase
         $father->method('facts')->willReturn(new Collection([$father_fact]));
 
         self::assertSame(
-            ["1 NAME /Whitytė/\n2 TYPE birth\n2 SURN Whitys"],
+            ["1 NAME /Whitytė/\n2 TYPE BIRTH\n2 SURN Whitys"],
             $this->surname_tradition->newChildNames($father, $mother, 'F')
         );
 
@@ -179,7 +179,7 @@ class LithuanianSurnameTraditionTest extends TestCase
         $father->method('facts')->willReturn(new Collection([$father_fact]));
 
         self::assertSame(
-            ["1 NAME /Whitiūtė/\n2 TYPE birth\n2 SURN Whitius"],
+            ["1 NAME /Whitiūtė/\n2 TYPE BIRTH\n2 SURN Whitius"],
             $this->surname_tradition->newChildNames($father, $mother, 'F')
         );
 
@@ -190,7 +190,7 @@ class LithuanianSurnameTraditionTest extends TestCase
         $father->method('facts')->willReturn(new Collection([$father_fact]));
 
         self::assertSame(
-            ["1 NAME /Whitutė/\n2 TYPE birth\n2 SURN Whitus"],
+            ["1 NAME /Whitutė/\n2 TYPE BIRTH\n2 SURN Whitus"],
             $this->surname_tradition->newChildNames($father, $mother, 'F')
         );
     }
@@ -218,7 +218,7 @@ class LithuanianSurnameTraditionTest extends TestCase
         $mother->method('facts')->willReturn(new Collection([$mother_fact]));
 
         self::assertSame(
-            ["1 NAME /White/\n2 TYPE birth\n2 SURN White"],
+            ["1 NAME /White/\n2 TYPE BIRTH\n2 SURN White"],
             $this->surname_tradition->newChildNames($father, $mother, 'U')
         );
     }
@@ -234,7 +234,7 @@ class LithuanianSurnameTraditionTest extends TestCase
     public function testNewChildNamesWithNoParentsNames(): void
     {
         self::assertSame(
-            ["1 NAME //\n2 TYPE birth"],
+            ["1 NAME //\n2 TYPE BIRTH"],
             $this->surname_tradition->newChildNames(null, null, 'U')
         );
     }
@@ -256,7 +256,7 @@ class LithuanianSurnameTraditionTest extends TestCase
         $individual->method('facts')->willReturn(new Collection([$fact]));
 
         self::assertSame(
-            ["1 NAME /White/\n2 TYPE birth\n2 SURN White"],
+            ["1 NAME /White/\n2 TYPE BIRTH\n2 SURN White"],
             $this->surname_tradition->newParentNames($individual, 'M')
         );
     }
@@ -278,7 +278,7 @@ class LithuanianSurnameTraditionTest extends TestCase
         $individual->method('facts')->willReturn(new Collection([$fact]));
 
         self::assertSame(
-            ["1 NAME /Whitas/\n2 TYPE birth\n2 SURN Whitas"],
+            ["1 NAME /Whitas/\n2 TYPE BIRTH\n2 SURN Whitas"],
             $this->surname_tradition->newParentNames($individual, 'M')
         );
 
@@ -289,7 +289,7 @@ class LithuanianSurnameTraditionTest extends TestCase
         $individual->method('facts')->willReturn(new Collection([$fact]));
 
         self::assertSame(
-            ["1 NAME /Whitis/\n2 TYPE birth\n2 SURN Whitis"],
+            ["1 NAME /Whitis/\n2 TYPE BIRTH\n2 SURN Whitis"],
             $this->surname_tradition->newParentNames($individual, 'M')
         );
 
@@ -300,7 +300,7 @@ class LithuanianSurnameTraditionTest extends TestCase
         $individual->method('facts')->willReturn(new Collection([$fact]));
 
         self::assertSame(
-            ["1 NAME /Whitius/\n2 TYPE birth\n2 SURN Whitius"],
+            ["1 NAME /Whitius/\n2 TYPE BIRTH\n2 SURN Whitius"],
             $this->surname_tradition->newParentNames($individual, 'M')
         );
 
@@ -311,7 +311,7 @@ class LithuanianSurnameTraditionTest extends TestCase
         $individual->method('facts')->willReturn(new Collection([$fact]));
 
         self::assertSame(
-            ["1 NAME /Whitus/\n2 TYPE birth\n2 SURN Whitus"],
+            ["1 NAME /Whitus/\n2 TYPE BIRTH\n2 SURN Whitus"],
             $this->surname_tradition->newParentNames($individual, 'M')
         );
     }
@@ -333,7 +333,7 @@ class LithuanianSurnameTraditionTest extends TestCase
         $individual->method('facts')->willReturn(new Collection([$fact]));
 
         self::assertSame(
-            ["1 NAME //\n2 TYPE birth"],
+            ["1 NAME //\n2 TYPE BIRTH"],
             $this->surname_tradition->newParentNames($individual, 'F')
         );
     }
@@ -355,7 +355,7 @@ class LithuanianSurnameTraditionTest extends TestCase
         $individual->method('facts')->willReturn(new Collection([$fact]));
 
         self::assertSame(
-            ["1 NAME //\n2 TYPE birth"],
+            ["1 NAME //\n2 TYPE BIRTH"],
             $this->surname_tradition->newParentNames($individual, 'U')
         );
     }
@@ -377,7 +377,7 @@ class LithuanianSurnameTraditionTest extends TestCase
         $individual->method('facts')->willReturn(new Collection([$fact]));
 
         self::assertSame(
-            ["1 NAME //\n2 TYPE birth"],
+            ["1 NAME //\n2 TYPE BIRTH"],
             $this->surname_tradition->newSpouseNames($individual, 'M')
         );
     }
@@ -399,7 +399,7 @@ class LithuanianSurnameTraditionTest extends TestCase
         $individual->method('facts')->willReturn(new Collection([$fact]));
 
         self::assertSame(
-            ["1 NAME //\n2 TYPE birth", "1 NAME /White/\n2 TYPE married\n2 SURN White"],
+            ["1 NAME //\n2 TYPE BIRTH", "1 NAME /White/\n2 TYPE MARRIED\n2 SURN White"],
             $this->surname_tradition->newSpouseNames($individual, 'F')
         );
     }
@@ -421,7 +421,7 @@ class LithuanianSurnameTraditionTest extends TestCase
         $individual->method('facts')->willReturn(new Collection([$fact]));
 
         self::assertSame(
-            ["1 NAME //\n2 TYPE birth"],
+            ["1 NAME //\n2 TYPE BIRTH"],
             $this->surname_tradition->newSpouseNames($individual, 'U')
         );
     }
diff --git a/tests/app/SurnameTradition/MatrilinealSurnameTraditionTest.php b/tests/app/SurnameTradition/MatrilinealSurnameTraditionTest.php
index a1892a47fe..b121b92137 100644
--- a/tests/app/SurnameTradition/MatrilinealSurnameTraditionTest.php
+++ b/tests/app/SurnameTradition/MatrilinealSurnameTraditionTest.php
@@ -77,17 +77,17 @@ class MatrilinealSurnameTraditionTest extends TestCase
         $mother->method('facts')->willReturn(new Collection([$mother_fact]));
 
         self::assertSame(
-            ["1 NAME /Black/\n2 TYPE birth\n2 SURN Black"],
+            ["1 NAME /Black/\n2 TYPE BIRTH\n2 SURN Black"],
             $this->surname_tradition->newChildNames($father, $mother, 'M')
         );
 
         self::assertSame(
-            ["1 NAME /Black/\n2 TYPE birth\n2 SURN Black"],
+            ["1 NAME /Black/\n2 TYPE BIRTH\n2 SURN Black"],
             $this->surname_tradition->newChildNames($father, $mother, 'F')
         );
 
         self::assertSame(
-            ["1 NAME /Black/\n2 TYPE birth\n2 SURN Black"],
+            ["1 NAME /Black/\n2 TYPE BIRTH\n2 SURN Black"],
             $this->surname_tradition->newChildNames($father, $mother, 'U')
         );
     }
@@ -114,7 +114,7 @@ class MatrilinealSurnameTraditionTest extends TestCase
         $mother->method('facts')->willReturn(new Collection([$mother_fact]));
 
         self::assertSame(
-            ["1 NAME /van Black/\n2 TYPE birth\n2 SPFX van\n2 SURN Black"],
+            ["1 NAME /van Black/\n2 TYPE BIRTH\n2 SPFX van\n2 SURN Black"],
             $this->surname_tradition->newChildNames($father, $mother, 'U')
         );
     }
@@ -129,7 +129,7 @@ class MatrilinealSurnameTraditionTest extends TestCase
     public function testNewChildNamesWithNoParentsNames(): void
     {
         self::assertSame(
-            ["1 NAME //\n2 TYPE birth"],
+            ["1 NAME //\n2 TYPE BIRTH"],
             $this->surname_tradition->newChildNames(null, null, 'U')
         );
     }
@@ -151,17 +151,17 @@ class MatrilinealSurnameTraditionTest extends TestCase
 
 
         self::assertSame(
-            ["1 NAME //\n2 TYPE birth"],
+            ["1 NAME //\n2 TYPE BIRTH"],
             $this->surname_tradition->newParentNames($individual, 'M')
         );
 
         self::assertSame(
-            ["1 NAME /White/\n2 TYPE birth\n2 SURN White"],
+            ["1 NAME /White/\n2 TYPE BIRTH\n2 SURN White"],
             $this->surname_tradition->newParentNames($individual, 'F')
         );
 
         self::assertSame(
-            ["1 NAME //\n2 TYPE birth"],
+            ["1 NAME //\n2 TYPE BIRTH"],
             $this->surname_tradition->newParentNames($individual, 'U')
         );
     }
@@ -182,17 +182,17 @@ class MatrilinealSurnameTraditionTest extends TestCase
         $individual->method('facts')->willReturn(new Collection([$fact]));
 
         self::assertSame(
-            ["1 NAME //\n2 TYPE birth"],
+            ["1 NAME //\n2 TYPE BIRTH"],
             $this->surname_tradition->newSpouseNames($individual, 'M')
         );
 
         self::assertSame(
-            ["1 NAME //\n2 TYPE birth"],
+            ["1 NAME //\n2 TYPE BIRTH"],
             $this->surname_tradition->newSpouseNames($individual, 'F')
         );
 
         self::assertSame(
-            ["1 NAME //\n2 TYPE birth"],
+            ["1 NAME //\n2 TYPE BIRTH"],
             $this->surname_tradition->newSpouseNames($individual, 'U')
         );
     }
diff --git a/tests/app/SurnameTradition/PaternalSurnameTraditionTest.php b/tests/app/SurnameTradition/PaternalSurnameTraditionTest.php
index 36a753c626..c8b0ee0769 100644
--- a/tests/app/SurnameTradition/PaternalSurnameTraditionTest.php
+++ b/tests/app/SurnameTradition/PaternalSurnameTraditionTest.php
@@ -65,17 +65,17 @@ class PaternalSurnameTraditionTest extends TestCase
         $mother->method('facts')->willReturn(new Collection([$mother_fact]));
 
         self::assertSame(
-            ["1 NAME /White/\n2 TYPE birth\n2 SURN White"],
+            ["1 NAME /White/\n2 TYPE BIRTH\n2 SURN White"],
             $this->surname_tradition->newChildNames($father, $mother, 'M')
         );
 
         self::assertSame(
-            ["1 NAME /White/\n2 TYPE birth\n2 SURN White"],
+            ["1 NAME /White/\n2 TYPE BIRTH\n2 SURN White"],
             $this->surname_tradition->newChildNames($father, $mother, 'F')
         );
 
         self::assertSame(
-            ["1 NAME /White/\n2 TYPE birth\n2 SURN White"],
+            ["1 NAME /White/\n2 TYPE BIRTH\n2 SURN White"],
             $this->surname_tradition->newChildNames($father, $mother, 'U')
         );
     }
@@ -102,7 +102,7 @@ class PaternalSurnameTraditionTest extends TestCase
         $mother->method('facts')->willReturn(new Collection([$mother_fact]));
 
         self::assertSame(
-            ["1 NAME /de White/\n2 TYPE birth\n2 SPFX de\n2 SURN White"],
+            ["1 NAME /de White/\n2 TYPE BIRTH\n2 SPFX de\n2 SURN White"],
             $this->surname_tradition->newChildNames($father, $mother, 'U')
         );
     }
@@ -129,7 +129,7 @@ class PaternalSurnameTraditionTest extends TestCase
         $mother->method('facts')->willReturn(new Collection([$mother_fact]));
 
         self::assertSame(
-            ["1 NAME /van der White/\n2 TYPE birth\n2 SPFX van der\n2 SURN White"],
+            ["1 NAME /van der White/\n2 TYPE BIRTH\n2 SPFX van der\n2 SURN White"],
             $this->surname_tradition->newChildNames($father, $mother, 'U')
         );
     }
@@ -156,7 +156,7 @@ class PaternalSurnameTraditionTest extends TestCase
         $mother->method('facts')->willReturn(new Collection([$mother_fact]));
 
         self::assertSame(
-            ["1 NAME /'t White/\n2 TYPE birth\n2 SPFX 't\n2 SURN White"],
+            ["1 NAME /'t White/\n2 TYPE BIRTH\n2 SPFX 't\n2 SURN White"],
             $this->surname_tradition->newChildNames($father, $mother, 'U')
         );
     }
@@ -183,7 +183,7 @@ class PaternalSurnameTraditionTest extends TestCase
         $mother->method('facts')->willReturn(new Collection([$mother_fact]));
 
         self::assertSame(
-            ["1 NAME /van 't White/\n2 TYPE birth\n2 SPFX van 't\n2 SURN White"],
+            ["1 NAME /van 't White/\n2 TYPE BIRTH\n2 SPFX van 't\n2 SURN White"],
             $this->surname_tradition->newChildNames($father, $mother, 'U')
         );
     }
@@ -204,7 +204,7 @@ class PaternalSurnameTraditionTest extends TestCase
         $individual->method('facts')->willReturn(new Collection([$fact]));
 
         self::assertSame(
-            ["1 NAME /White/\n2 TYPE birth\n2 SURN White"],
+            ["1 NAME /White/\n2 TYPE BIRTH\n2 SURN White"],
             $this->surname_tradition->newParentNames($individual, 'M')
         );
     }
@@ -225,7 +225,7 @@ class PaternalSurnameTraditionTest extends TestCase
         $individual->method('facts')->willReturn(new Collection([$fact]));
 
         self::assertSame(
-            ["1 NAME //\n2 TYPE birth", "1 NAME /White/\n2 TYPE married\n2 SURN White"],
+            ["1 NAME //\n2 TYPE BIRTH", "1 NAME /White/\n2 TYPE MARRIED\n2 SURN White"],
             $this->surname_tradition->newParentNames($individual, 'F')
         );
     }
@@ -246,7 +246,7 @@ class PaternalSurnameTraditionTest extends TestCase
         $individual->method('facts')->willReturn(new Collection([$fact]));
 
         self::assertSame(
-            ["1 NAME //\n2 TYPE birth"],
+            ["1 NAME //\n2 TYPE BIRTH"],
             $this->surname_tradition->newParentNames($individual, 'U')
         );
     }
@@ -267,7 +267,7 @@ class PaternalSurnameTraditionTest extends TestCase
         $individual->method('facts')->willReturn(new Collection([$fact]));
 
         self::assertSame(
-            ["1 NAME //\n2 TYPE birth"],
+            ["1 NAME //\n2 TYPE BIRTH"],
             $this->surname_tradition->newSpouseNames($individual, 'M')
         );
     }
@@ -288,7 +288,7 @@ class PaternalSurnameTraditionTest extends TestCase
         $individual->method('facts')->willReturn(new Collection([$fact]));
 
         self::assertSame(
-            ["1 NAME //\n2 TYPE birth", "1 NAME /White/\n2 TYPE married\n2 SURN White"],
+            ["1 NAME //\n2 TYPE BIRTH", "1 NAME /White/\n2 TYPE MARRIED\n2 SURN White"],
             $this->surname_tradition->newSpouseNames($individual, 'F')
         );
     }
@@ -309,7 +309,7 @@ class PaternalSurnameTraditionTest extends TestCase
         $individual->method('facts')->willReturn(new Collection([$fact]));
 
         self::assertSame(
-            ["1 NAME //\n2 TYPE birth", "1 NAME /van der White/\n2 TYPE married\n2 SPFX van der\n2 SURN White"],
+            ["1 NAME //\n2 TYPE BIRTH", "1 NAME /van der White/\n2 TYPE MARRIED\n2 SPFX van der\n2 SURN White"],
             $this->surname_tradition->newSpouseNames($individual, 'F')
         );
     }
@@ -330,7 +330,7 @@ class PaternalSurnameTraditionTest extends TestCase
         $individual->method('facts')->willReturn(new Collection([$fact]));
 
         self::assertSame(
-            ["1 NAME //\n2 TYPE birth"],
+            ["1 NAME //\n2 TYPE BIRTH"],
             $this->surname_tradition->newSpouseNames($individual, 'U')
         );
     }
diff --git a/tests/app/SurnameTradition/PatrilinealSurnameTraditionTest.php b/tests/app/SurnameTradition/PatrilinealSurnameTraditionTest.php
index ec8fffa0ea..209e86d6c4 100644
--- a/tests/app/SurnameTradition/PatrilinealSurnameTraditionTest.php
+++ b/tests/app/SurnameTradition/PatrilinealSurnameTraditionTest.php
@@ -77,17 +77,17 @@ class PatrilinealSurnameTraditionTest extends TestCase
         $mother->method('facts')->willReturn(new Collection([$mother_fact]));
 
         self::assertSame(
-            ["1 NAME /White/\n2 TYPE birth\n2 SURN White"],
+            ["1 NAME /White/\n2 TYPE BIRTH\n2 SURN White"],
             $this->surname_tradition->newChildNames($father, $mother, 'M')
         );
 
         self::assertSame(
-            ["1 NAME /White/\n2 TYPE birth\n2 SURN White"],
+            ["1 NAME /White/\n2 TYPE BIRTH\n2 SURN White"],
             $this->surname_tradition->newChildNames($father, $mother, 'F')
         );
 
         self::assertSame(
-            ["1 NAME /White/\n2 TYPE birth\n2 SURN White"],
+            ["1 NAME /White/\n2 TYPE BIRTH\n2 SURN White"],
             $this->surname_tradition->newChildNames($father, $mother, 'U')
         );
     }
@@ -114,7 +114,7 @@ class PatrilinealSurnameTraditionTest extends TestCase
         $mother->method('facts')->willReturn(new Collection([$mother_fact]));
 
         self::assertSame(
-            ["1 NAME /de White/\n2 TYPE birth\n2 SPFX de\n2 SURN White"],
+            ["1 NAME /de White/\n2 TYPE BIRTH\n2 SPFX de\n2 SURN White"],
             $this->surname_tradition->newChildNames($father, $mother, 'U')
         );
     }
@@ -129,7 +129,7 @@ class PatrilinealSurnameTraditionTest extends TestCase
     public function testNewChildNamesWithNoParentsNames(): void
     {
         self::assertSame(
-            ["1 NAME //\n2 TYPE birth"],
+            ["1 NAME //\n2 TYPE BIRTH"],
             $this->surname_tradition->newChildNames(null, null, 'U')
         );
     }
@@ -150,17 +150,17 @@ class PatrilinealSurnameTraditionTest extends TestCase
         $individual->method('facts')->willReturn(new Collection([$fact]));
 
         self::assertSame(
-            ["1 NAME /White/\n2 TYPE birth\n2 SURN White"],
+            ["1 NAME /White/\n2 TYPE BIRTH\n2 SURN White"],
             $this->surname_tradition->newParentNames($individual, 'M')
         );
 
         self::assertSame(
-            ["1 NAME //\n2 TYPE birth"],
+            ["1 NAME //\n2 TYPE BIRTH"],
             $this->surname_tradition->newParentNames($individual, 'F')
         );
 
         self::assertSame(
-            ["1 NAME //\n2 TYPE birth"],
+            ["1 NAME //\n2 TYPE BIRTH"],
             $this->surname_tradition->newParentNames($individual, 'U')
         );
     }
@@ -181,17 +181,17 @@ class PatrilinealSurnameTraditionTest extends TestCase
         $individual->method('facts')->willReturn(new Collection([$fact]));
 
         self::assertSame(
-            ["1 NAME //\n2 TYPE birth"],
+            ["1 NAME //\n2 TYPE BIRTH"],
             $this->surname_tradition->newSpouseNames($individual, 'M')
         );
 
         self::assertSame(
-            ["1 NAME //\n2 TYPE birth"],
+            ["1 NAME //\n2 TYPE BIRTH"],
             $this->surname_tradition->newSpouseNames($individual, 'F')
         );
 
         self::assertSame(
-            ["1 NAME //\n2 TYPE birth"],
+            ["1 NAME //\n2 TYPE BIRTH"],
             $this->surname_tradition->newSpouseNames($individual, 'U')
         );
     }
diff --git a/tests/app/SurnameTradition/PolishSurnameTraditionTest.php b/tests/app/SurnameTradition/PolishSurnameTraditionTest.php
index 910f580db5..07d90477b4 100644
--- a/tests/app/SurnameTradition/PolishSurnameTraditionTest.php
+++ b/tests/app/SurnameTradition/PolishSurnameTraditionTest.php
@@ -67,7 +67,7 @@ class PolishSurnameTraditionTest extends TestCase
         $mother->method('facts')->willReturn(new Collection([$mother_fact]));
 
         self::assertSame(
-            ["1 NAME /White/\n2 TYPE birth\n2 SURN White"],
+            ["1 NAME /White/\n2 TYPE BIRTH\n2 SURN White"],
             $this->surname_tradition->newChildNames($father, $mother, 'M')
         );
     }
@@ -95,7 +95,7 @@ class PolishSurnameTraditionTest extends TestCase
         $mother->method('facts')->willReturn(new Collection([$mother_fact]));
 
         self::assertSame(
-            ["1 NAME /White/\n2 TYPE birth\n2 SURN White"],
+            ["1 NAME /White/\n2 TYPE BIRTH\n2 SURN White"],
             $this->surname_tradition->newChildNames($father, $mother, 'F')
         );
     }
@@ -123,7 +123,7 @@ class PolishSurnameTraditionTest extends TestCase
         $mother->method('facts')->willReturn(new Collection([$mother_fact]));
 
         self::assertSame(
-            ["1 NAME /Whitecka/\n2 TYPE birth\n2 SURN Whitecki"],
+            ["1 NAME /Whitecka/\n2 TYPE BIRTH\n2 SURN Whitecki"],
             $this->surname_tradition->newChildNames($father, $mother, 'F')
         );
 
@@ -140,7 +140,7 @@ class PolishSurnameTraditionTest extends TestCase
         $mother->method('facts')->willReturn(new Collection([$mother_fact]));
 
         self::assertSame(
-            ["1 NAME /Whitedzka/\n2 TYPE birth\n2 SURN Whitedzki"],
+            ["1 NAME /Whitedzka/\n2 TYPE BIRTH\n2 SURN Whitedzki"],
             $this->surname_tradition->newChildNames($father, $mother, 'F')
         );
 
@@ -157,7 +157,7 @@ class PolishSurnameTraditionTest extends TestCase
         $mother->method('facts')->willReturn(new Collection([$mother_fact]));
 
         self::assertSame(
-            ["1 NAME /Whiteska/\n2 TYPE birth\n2 SURN Whiteski"],
+            ["1 NAME /Whiteska/\n2 TYPE BIRTH\n2 SURN Whiteski"],
             $this->surname_tradition->newChildNames($father, $mother, 'F')
         );
 
@@ -174,7 +174,7 @@ class PolishSurnameTraditionTest extends TestCase
         $mother->method('facts')->willReturn(new Collection([$mother_fact]));
 
         self::assertSame(
-            ["1 NAME /Whiteżka/\n2 TYPE birth\n2 SURN Whiteżki"],
+            ["1 NAME /Whiteżka/\n2 TYPE BIRTH\n2 SURN Whiteżki"],
             $this->surname_tradition->newChildNames($father, $mother, 'F')
         );
     }
@@ -202,7 +202,7 @@ class PolishSurnameTraditionTest extends TestCase
         $mother->method('facts')->willReturn(new Collection([$mother_fact]));
 
         self::assertSame(
-            ["1 NAME /White/\n2 TYPE birth\n2 SURN White"],
+            ["1 NAME /White/\n2 TYPE BIRTH\n2 SURN White"],
             $this->surname_tradition->newChildNames($father, $mother, 'U')
         );
     }
@@ -218,7 +218,7 @@ class PolishSurnameTraditionTest extends TestCase
     public function testNewChildNamesWithNoParentsNames(): void
     {
         self::assertSame(
-            ["1 NAME //\n2 TYPE birth"],
+            ["1 NAME //\n2 TYPE BIRTH"],
             $this->surname_tradition->newChildNames(null, null, 'U')
         );
     }
@@ -240,7 +240,7 @@ class PolishSurnameTraditionTest extends TestCase
         $individual->method('facts')->willReturn(new Collection([$fact]));
 
         self::assertSame(
-            ["1 NAME /White/\n2 TYPE birth\n2 SURN White"],
+            ["1 NAME /White/\n2 TYPE BIRTH\n2 SURN White"],
             $this->surname_tradition->newParentNames($individual, 'M')
         );
     }
@@ -262,7 +262,7 @@ class PolishSurnameTraditionTest extends TestCase
         $individual->method('facts')->willReturn(new Collection([$fact]));
 
         self::assertSame(
-            ["1 NAME /Whitecki/\n2 TYPE birth\n2 SURN Whitecki"],
+            ["1 NAME /Whitecki/\n2 TYPE BIRTH\n2 SURN Whitecki"],
             $this->surname_tradition->newParentNames($individual, 'M')
         );
 
@@ -273,7 +273,7 @@ class PolishSurnameTraditionTest extends TestCase
         $individual->method('facts')->willReturn(new Collection([$fact]));
 
         self::assertSame(
-            ["1 NAME /Whitedzki/\n2 TYPE birth\n2 SURN Whitedzki"],
+            ["1 NAME /Whitedzki/\n2 TYPE BIRTH\n2 SURN Whitedzki"],
             $this->surname_tradition->newParentNames($individual, 'M')
         );
 
@@ -284,7 +284,7 @@ class PolishSurnameTraditionTest extends TestCase
         $individual->method('facts')->willReturn(new Collection([$fact]));
 
         self::assertSame(
-            ["1 NAME /Whiteski/\n2 TYPE birth\n2 SURN Whiteski"],
+            ["1 NAME /Whiteski/\n2 TYPE BIRTH\n2 SURN Whiteski"],
             $this->surname_tradition->newParentNames($individual, 'M')
         );
 
@@ -295,7 +295,7 @@ class PolishSurnameTraditionTest extends TestCase
         $individual->method('facts')->willReturn(new Collection([$fact]));
 
         self::assertSame(
-            ["1 NAME /Whiteżki/\n2 TYPE birth\n2 SURN Whiteżki"],
+            ["1 NAME /Whiteżki/\n2 TYPE BIRTH\n2 SURN Whiteżki"],
             $this->surname_tradition->newParentNames($individual, 'M')
         );
     }
@@ -317,7 +317,7 @@ class PolishSurnameTraditionTest extends TestCase
         $individual->method('facts')->willReturn(new Collection([$fact]));
 
         self::assertSame(
-            ["1 NAME //\n2 TYPE birth"],
+            ["1 NAME //\n2 TYPE BIRTH"],
             $this->surname_tradition->newParentNames($individual, 'F')
         );
     }
@@ -339,7 +339,7 @@ class PolishSurnameTraditionTest extends TestCase
         $individual->method('facts')->willReturn(new Collection([$fact]));
 
         self::assertSame(
-            ["1 NAME //\n2 TYPE birth"],
+            ["1 NAME //\n2 TYPE BIRTH"],
             $this->surname_tradition->newParentNames($individual, 'U')
         );
     }
@@ -361,17 +361,17 @@ class PolishSurnameTraditionTest extends TestCase
         $individual->method('facts')->willReturn(new Collection([$fact]));
 
         self::assertSame(
-            ["1 NAME //\n2 TYPE birth"],
+            ["1 NAME //\n2 TYPE BIRTH"],
             $this->surname_tradition->newSpouseNames($individual, 'M')
         );
 
         self::assertSame(
-            ["1 NAME //\n2 TYPE birth", "1 NAME /White/\n2 TYPE married\n2 SURN White"],
+            ["1 NAME //\n2 TYPE BIRTH", "1 NAME /White/\n2 TYPE MARRIED\n2 SURN White"],
             $this->surname_tradition->newSpouseNames($individual, 'F')
         );
 
         self::assertSame(
-            ["1 NAME //\n2 TYPE birth"],
+            ["1 NAME //\n2 TYPE BIRTH"],
             $this->surname_tradition->newSpouseNames($individual, 'U')
         );
     }
diff --git a/tests/app/SurnameTradition/PortugueseSurnameTraditionTest.php b/tests/app/SurnameTradition/PortugueseSurnameTraditionTest.php
index 108f27ca38..32c4e24e85 100644
--- a/tests/app/SurnameTradition/PortugueseSurnameTraditionTest.php
+++ b/tests/app/SurnameTradition/PortugueseSurnameTraditionTest.php
@@ -77,17 +77,17 @@ class PortugueseSurnameTraditionTest extends TestCase
         $mother->method('facts')->willReturn(new Collection([$mother_fact]));
 
         self::assertSame(
-            ["1 NAME /Iglesias/ /Lorca/\n2 TYPE birth\n2 SURN Iglesias,Lorca"],
+            ["1 NAME /Iglesias/ /Lorca/\n2 TYPE BIRTH\n2 SURN Iglesias,Lorca"],
             $this->surname_tradition->newChildNames($father, $mother, 'M')
         );
 
         self::assertSame(
-            ["1 NAME /Iglesias/ /Lorca/\n2 TYPE birth\n2 SURN Iglesias,Lorca"],
+            ["1 NAME /Iglesias/ /Lorca/\n2 TYPE BIRTH\n2 SURN Iglesias,Lorca"],
             $this->surname_tradition->newChildNames($father, $mother, 'F')
         );
 
         self::assertSame(
-            ["1 NAME /Iglesias/ /Lorca/\n2 TYPE birth\n2 SURN Iglesias,Lorca"],
+            ["1 NAME /Iglesias/ /Lorca/\n2 TYPE BIRTH\n2 SURN Iglesias,Lorca"],
             $this->surname_tradition->newChildNames($father, $mother, 'U')
         );
     }
@@ -102,7 +102,7 @@ class PortugueseSurnameTraditionTest extends TestCase
     public function testNewChildNamesWithNoParentsNames(): void
     {
         self::assertSame(
-            ["1 NAME // //\n2 TYPE birth"],
+            ["1 NAME // //\n2 TYPE BIRTH"],
             $this->surname_tradition->newChildNames(null, null, 'U')
         );
     }
@@ -129,7 +129,7 @@ class PortugueseSurnameTraditionTest extends TestCase
         $mother->method('facts')->willReturn(new Collection([$mother_fact]));
 
         self::assertSame(
-            ["1 NAME /Iglesias/ /Lorca/\n2 TYPE birth\n2 SURN Iglesias,Lorca"],
+            ["1 NAME /Iglesias/ /Lorca/\n2 TYPE BIRTH\n2 SURN Iglesias,Lorca"],
             $this->surname_tradition->newChildNames($father, $mother, 'M')
         );
     }
@@ -150,16 +150,16 @@ class PortugueseSurnameTraditionTest extends TestCase
         $individual->method('facts')->willReturn(new Collection([$fact]));
 
         self::assertSame(
-            ["1 NAME // /Garcia/\n2 TYPE birth\n2 SURN Garcia"],
+            ["1 NAME // /Garcia/\n2 TYPE BIRTH\n2 SURN Garcia"],
             $this->surname_tradition->newParentNames($individual, 'M')
         );
         self::assertSame(
-            ["1 NAME // /Iglesias/\n2 TYPE birth\n2 SURN Iglesias"],
+            ["1 NAME // /Iglesias/\n2 TYPE BIRTH\n2 SURN Iglesias"],
             $this->surname_tradition->newParentNames($individual, 'F')
         );
 
         self::assertSame(
-            ["1 NAME // //\n2 TYPE birth"],
+            ["1 NAME // //\n2 TYPE BIRTH"],
             $this->surname_tradition->newParentNames($individual, 'U')
         );
     }
@@ -180,17 +180,17 @@ class PortugueseSurnameTraditionTest extends TestCase
         $individual->method('facts')->willReturn(new Collection([$fact]));
 
         self::assertSame(
-            ["1 NAME // //\n2 TYPE birth"],
+            ["1 NAME // //\n2 TYPE BIRTH"],
             $this->surname_tradition->newSpouseNames($individual, 'M')
         );
 
         self::assertSame(
-            ["1 NAME // //\n2 TYPE birth"],
+            ["1 NAME // //\n2 TYPE BIRTH"],
             $this->surname_tradition->newSpouseNames($individual, 'F')
         );
 
         self::assertSame(
-            ["1 NAME // //\n2 TYPE birth"],
+            ["1 NAME // //\n2 TYPE BIRTH"],
             $this->surname_tradition->newSpouseNames($individual, 'U')
         );
     }
diff --git a/tests/app/SurnameTradition/SpanishSurnameTraditionTest.php b/tests/app/SurnameTradition/SpanishSurnameTraditionTest.php
index 23b2cbda90..b220cca2ae 100644
--- a/tests/app/SurnameTradition/SpanishSurnameTraditionTest.php
+++ b/tests/app/SurnameTradition/SpanishSurnameTraditionTest.php
@@ -65,17 +65,17 @@ class SpanishSurnameTraditionTest extends TestCase
         $mother->method('facts')->willReturn(new Collection([$mother_fact]));
 
         self::assertSame(
-            ["1 NAME /Garcia/ /Ruiz/\n2 TYPE birth\n2 SURN Garcia,Ruiz"],
+            ["1 NAME /Garcia/ /Ruiz/\n2 TYPE BIRTH\n2 SURN Garcia,Ruiz"],
             $this->surname_tradition->newChildNames($father, $mother, 'M')
         );
 
         self::assertSame(
-            ["1 NAME /Garcia/ /Ruiz/\n2 TYPE birth\n2 SURN Garcia,Ruiz"],
+            ["1 NAME /Garcia/ /Ruiz/\n2 TYPE BIRTH\n2 SURN Garcia,Ruiz"],
             $this->surname_tradition->newChildNames($father, $mother, 'F')
         );
 
         self::assertSame(
-            ["1 NAME /Garcia/ /Ruiz/\n2 TYPE birth\n2 SURN Garcia,Ruiz"],
+            ["1 NAME /Garcia/ /Ruiz/\n2 TYPE BIRTH\n2 SURN Garcia,Ruiz"],
             $this->surname_tradition->newChildNames($father, $mother, 'U')
         );
     }
@@ -90,7 +90,7 @@ class SpanishSurnameTraditionTest extends TestCase
     public function testNewChildNamesWithNoParentsNames(): void
     {
         self::assertSame(
-            ["1 NAME // //\n2 TYPE birth"],
+            ["1 NAME // //\n2 TYPE BIRTH"],
             $this->surname_tradition->newChildNames(null, null, 'U')
         );
     }
@@ -117,7 +117,7 @@ class SpanishSurnameTraditionTest extends TestCase
         $mother->method('facts')->willReturn(new Collection([$mother_fact]));
 
         self::assertSame(
-            ["1 NAME /Garcia/ /Ruiz/\n2 TYPE birth\n2 SURN Garcia,Ruiz"],
+            ["1 NAME /Garcia/ /Ruiz/\n2 TYPE BIRTH\n2 SURN Garcia,Ruiz"],
             $this->surname_tradition->newChildNames($father, $mother, 'M')
         );
     }
@@ -138,17 +138,17 @@ class SpanishSurnameTraditionTest extends TestCase
         $individual->method('facts')->willReturn(new Collection([$fact]));
 
         self::assertSame(
-            ["1 NAME /Garcia/ //\n2 TYPE birth\n2 SURN Garcia"],
+            ["1 NAME /Garcia/ //\n2 TYPE BIRTH\n2 SURN Garcia"],
             $this->surname_tradition->newParentNames($individual, 'M')
         );
 
         self::assertSame(
-            ["1 NAME /Iglesias/ //\n2 TYPE birth\n2 SURN Iglesias"],
+            ["1 NAME /Iglesias/ //\n2 TYPE BIRTH\n2 SURN Iglesias"],
             $this->surname_tradition->newParentNames($individual, 'F')
         );
 
         self::assertSame(
-            ["1 NAME // //\n2 TYPE birth"],
+            ["1 NAME // //\n2 TYPE BIRTH"],
             $this->surname_tradition->newParentNames($individual, 'U')
         );
     }
@@ -169,17 +169,17 @@ class SpanishSurnameTraditionTest extends TestCase
         $individual->method('facts')->willReturn(new Collection([$fact]));
 
         self::assertSame(
-            ["1 NAME // //\n2 TYPE birth"],
+            ["1 NAME // //\n2 TYPE BIRTH"],
             $this->surname_tradition->newSpouseNames($individual, 'M')
         );
 
         self::assertSame(
-            ["1 NAME // //\n2 TYPE birth"],
+            ["1 NAME // //\n2 TYPE BIRTH"],
             $this->surname_tradition->newSpouseNames($individual, 'F')
         );
 
         self::assertSame(
-            ["1 NAME // //\n2 TYPE birth"],
+            ["1 NAME // //\n2 TYPE BIRTH"],
             $this->surname_tradition->newSpouseNames($individual, 'U')
         );
     }