diff --git a/.github/workflows/build.lazarus.yml b/.github/workflows/build.lazarus.yml
index c9242df..a6b3865 100644
--- a/.github/workflows/build.lazarus.yml
+++ b/.github/workflows/build.lazarus.yml
@@ -26,7 +26,7 @@ on:
 jobs:
 
   build-app:
-    name: build-[${{ matrix.os }}][${{ matrix.lazarus-versions }}]
+    name: build [${{ matrix.os }}] [${{ matrix.lazarus-versions }}]
     runs-on: ${{ matrix.os }}
 
     env:
diff --git a/.github/workflows/release.lazarus.yml b/.github/workflows/release.lazarus.yml
index 8884cf2..1adc10c 100644
--- a/.github/workflows/release.lazarus.yml
+++ b/.github/workflows/release.lazarus.yml
@@ -16,7 +16,7 @@ on:
 jobs:
 
   release-app:
-    name: release-[${{ fromJSON(inputs.config).tag }}]
+    name: release [${{ fromJSON(inputs.config).tag }}]
     runs-on: ubuntu-latest
 
     steps:
diff --git a/.github/workflows/test.lazarus.yml b/.github/workflows/test.lazarus.yml
index 1445b9a..9483582 100644
--- a/.github/workflows/test.lazarus.yml
+++ b/.github/workflows/test.lazarus.yml
@@ -16,7 +16,7 @@ on:
 jobs:
 
   test-app:
-    name: test-[${{ matrix.os }}][${{ matrix.lazarus-versions }}]
+    name: test [${{ matrix.os }}] [${{ matrix.lazarus-versions }}]
     runs-on: ${{ matrix.os }}
 
     env:
diff --git a/lazarus/src/helloworld.lpi b/lazarus/src/helloworld.lpi
index 69f8f10..a26bc0e 100644
--- a/lazarus/src/helloworld.lpi
+++ b/lazarus/src/helloworld.lpi
@@ -13,9 +13,9 @@
       <UseAppBundle Value="False"/>
       <ResourceType Value="res"/>
     </General>
-    <BuildModes>
-      <Item Name="Default" Default="True"/>
-      <Item Name="Debug">
+    <BuildModes Count="3">
+      <Item1 Name="Default" Default="True"/>
+      <Item2 Name="Debug">
         <CompilerOptions>
           <Version Value="11"/>
           <Target>
@@ -48,8 +48,8 @@
             </Debugging>
           </Linking>
         </CompilerOptions>
-      </Item>
-      <Item Name="Release">
+      </Item2>
+      <Item3 Name="Release">
         <CompilerOptions>
           <Version Value="11"/>
           <Target>
@@ -73,7 +73,7 @@
             <LinkSmart Value="True"/>
           </Linking>
         </CompilerOptions>
-      </Item>
+      </Item3>
     </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
@@ -82,12 +82,12 @@
     <RunParams>
       <FormatVersion Value="2"/>
     </RunParams>
-    <Units>
-      <Unit>
+    <Units Count="1">
+      <Unit0>
         <Filename Value="helloworld.lpr"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="HelloWorld"/>
-      </Unit>
+      </Unit0>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
@@ -101,16 +101,16 @@
     </SearchPaths>
   </CompilerOptions>
   <Debugging>
-    <Exceptions>
-      <Item>
+    <Exceptions Count="3">
+      <Item1>
         <Name Value="EAbort"/>
-      </Item>
-      <Item>
+      </Item1>
+      <Item2>
         <Name Value="ECodetoolError"/>
-      </Item>
-      <Item>
+      </Item2>
+      <Item3>
         <Name Value="EFOpenError"/>
-      </Item>
+      </Item3>
     </Exceptions>
   </Debugging>
 </CONFIG>
diff --git a/lazarus/tests/helloworldtest.lpi b/lazarus/tests/helloworldtest.lpi
index eaf9f3b..c581644 100644
--- a/lazarus/tests/helloworldtest.lpi
+++ b/lazarus/tests/helloworldtest.lpi
@@ -13,9 +13,9 @@
       <UseAppBundle Value="False"/>
       <ResourceType Value="res"/>
     </General>
-    <BuildModes>
-      <Item Name="Default" Default="True"/>
-      <Item Name="Debug">
+    <BuildModes Count="3">
+      <Item1 Name="Default" Default="True"/>
+      <Item2 Name="Debug">
         <CompilerOptions>
           <Version Value="11"/>
           <Target>
@@ -48,8 +48,8 @@
             </Debugging>
           </Linking>
         </CompilerOptions>
-      </Item>
-      <Item Name="Release">
+      </Item2>
+      <Item3 Name="Release">
         <CompilerOptions>
           <Version Value="11"/>
           <Target>
@@ -73,7 +73,7 @@
             <LinkSmart Value="True"/>
           </Linking>
         </CompilerOptions>
-      </Item>
+      </Item3>
     </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
@@ -82,22 +82,22 @@
     <RunParams>
       <FormatVersion Value="2"/>
     </RunParams>
-    <RequiredPackages>
-      <Item>
+    <RequiredPackages Count="1">
+      <Item1>
         <PackageName Value="FCL"/>
-      </Item>
+      </Item1>
     </RequiredPackages>
-    <Units>
-      <Unit>
+    <Units Count="2">
+      <Unit0>
         <Filename Value="helloworldtest.lpr"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="HelloWorldTest"/>
-      </Unit>
-      <Unit>
+      </Unit0>
+      <Unit1>
         <Filename Value="tests.helloworld.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="Tests.HelloWorld"/>
-      </Unit>
+      </Unit1>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
@@ -111,16 +111,16 @@
     </SearchPaths>
   </CompilerOptions>
   <Debugging>
-    <Exceptions>
-      <Item>
+    <Exceptions Count="3">
+      <Item1>
         <Name Value="EAbort"/>
-      </Item>
-      <Item>
+      </Item1>
+      <Item2>
         <Name Value="ECodetoolError"/>
-      </Item>
-      <Item>
+      </Item2>
+      <Item3>
         <Name Value="EFOpenError"/>
-      </Item>
+      </Item3>
     </Exceptions>
   </Debugging>
 </CONFIG>