diff --git a/components/captcha/demos/runtime/capcha_demo.lpi b/components/captcha/demos/runtime/capcha_demo.lpi
index 2436f5620..749ae43df 100644
--- a/components/captcha/demos/runtime/capcha_demo.lpi
+++ b/components/captcha/demos/runtime/capcha_demo.lpi
@@ -45,9 +45,9 @@
         <ResourceBaseClass Value="Form"/>
       </Unit1>
       <Unit2>
-        <Filename Value="..\source\captchactrl.pas"/>
+        <Filename Value="..\..\source\captchactrl.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="CaptchaUnit"/>
+        <UnitName Value="CaptchaCtrl"/>
       </Unit2>
     </Units>
   </ProjectOptions>
@@ -59,7 +59,7 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <OtherUnitFiles Value="..\source"/>
+      <OtherUnitFiles Value="..\..\source"/>
       <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Linking>
diff --git a/components/captcha/demos/runtime/capcha_demo.lpr b/components/captcha/demos/runtime/capcha_demo.lpr
index 488b6781a..04657b161 100644
--- a/components/captcha/demos/runtime/capcha_demo.lpr
+++ b/components/captcha/demos/runtime/capcha_demo.lpr
@@ -10,7 +10,7 @@ uses
   athreads,
   {$ENDIF}
   Interfaces, // this includes the LCL widgetset
-  Forms, main
+  Forms, main, CaptchaCtrl
   { you can add units after this };
 
 {$R *.res}
diff --git a/components/captcha/demos/runtime/main.lfm b/components/captcha/demos/runtime/main.lfm
index 23f98f571..fcacf017b 100644
--- a/components/captcha/demos/runtime/main.lfm
+++ b/components/captcha/demos/runtime/main.lfm
@@ -81,7 +81,7 @@ object DemoForm: TDemoForm
       Left = 260
       Height = 103
       Top = 0
-      Width = 418
+      Width = 412
       AutoFill = True
       AutoSize = True
       BorderSpacing.Left = 24
@@ -96,7 +96,7 @@ object DemoForm: TDemoForm
       ChildSizing.Layout = cclLeftToRightThenTopToBottom
       ChildSizing.ControlsPerLine = 4
       ClientHeight = 83
-      ClientWidth = 414
+      ClientWidth = 408
       Columns = 4
       Items.Strings = (
         'Alpha uppercase'
@@ -117,12 +117,12 @@ object DemoForm: TDemoForm
         Left = 16
         Height = 25
         Top = 52
-        Width = 108
+        Width = 106
         Caption = '  '
       end
       object btnFont1: TButton
         AnchorSideTop.Side = asrBottom
-        Left = 136
+        Left = 134
         Height = 25
         Top = 52
         Width = 70
@@ -135,7 +135,7 @@ object DemoForm: TDemoForm
       object btnFont2: TButton
         AnchorSideLeft.Side = asrBottom
         AnchorSideTop.Side = asrBottom
-        Left = 254
+        Left = 250
         Height = 25
         Top = 52
         Width = 70
@@ -244,7 +244,7 @@ object DemoForm: TDemoForm
       Left = 113
       Height = 23
       Top = 135
-      Width = 565
+      Width = 559
       Anchors = [akTop, akLeft, akRight]
       OnChange = edUppercaseCharsChange
       TabOrder = 6
@@ -279,7 +279,7 @@ object DemoForm: TDemoForm
       Left = 113
       Height = 23
       Top = 162
-      Width = 565
+      Width = 559
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Top = 4
       OnChange = edLowercaseCharsChange
@@ -305,7 +305,7 @@ object DemoForm: TDemoForm
       Left = 113
       Height = 23
       Top = 189
-      Width = 565
+      Width = 559
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Top = 4
       OnChange = edNumericCharsChange
@@ -331,7 +331,7 @@ object DemoForm: TDemoForm
       Left = 113
       Height = 23
       Top = 216
-      Width = 565
+      Width = 559
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Top = 4
       OnChange = edCustomCharsChange
diff --git a/components/captcha/demos/runtime/main.pas b/components/captcha/demos/runtime/main.pas
index 79be07381..71a197b17 100644
--- a/components/captcha/demos/runtime/main.pas
+++ b/components/captcha/demos/runtime/main.pas
@@ -80,7 +80,7 @@ var
 begin
   Randomize;
 
-  FCaptcha := TCaptcha.Create(self);
+  FCaptcha := TCaptchaLabel.Create(self);
   FCaptcha.Width := Width;
   FCaptcha.Parent := self;
   FCaptcha.Color := clWhite;
diff --git a/components/captcha/demos/simple_demo/simpledemo.lpi b/components/captcha/demos/simple_demo/simpledemo.lpi
index f17766dcc..830f4f81e 100644
--- a/components/captcha/demos/simple_demo/simpledemo.lpi
+++ b/components/captcha/demos/simple_demo/simpledemo.lpi
@@ -4,6 +4,9 @@
     <Version Value="12"/>
     <PathDelim Value="\"/>
     <General>
+      <Flags>
+        <CompatibilityMode Value="True"/>
+      </Flags>
       <SessionStorage Value="InProjectDir"/>
       <Title Value="SimpleDemo"/>
       <Scaled Value="True"/>
@@ -14,8 +17,8 @@
       </XPManifest>
       <Icon Value="0"/>
     </General>
-    <BuildModes>
-      <Item Name="Default" Default="True"/>
+    <BuildModes Count="1">
+      <Item1 Name="Default" Default="True"/>
     </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
@@ -24,26 +27,28 @@
     <RunParams>
       <FormatVersion Value="2"/>
     </RunParams>
-    <RequiredPackages>
-      <Item>
+    <RequiredPackages Count="2">
+      <Item1>
         <PackageName Value="captcha_pkg"/>
-      </Item>
-      <Item>
+      </Item1>
+      <Item2>
         <PackageName Value="LCL"/>
-      </Item>
+      </Item2>
     </RequiredPackages>
-    <Units>
-      <Unit>
-        <Filename Value="SimpleDemo.lpr"/>
+    <Units Count="2">
+      <Unit0>
+        <Filename Value="simpledemo.lpr"/>
         <IsPartOfProject Value="True"/>
-      </Unit>
-      <Unit>
+        <UnitName Value="SimpleDemo"/>
+      </Unit0>
+      <Unit1>
         <Filename Value="main.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="Form1"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Main"/>
-      </Unit>
+      </Unit1>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
@@ -65,16 +70,16 @@
     </Linking>
   </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/components/captcha/demos/simple_demo/simpledemo.lpr b/components/captcha/demos/simple_demo/simpledemo.lpr
index 756bac260..937e5d15d 100644
--- a/components/captcha/demos/simple_demo/simpledemo.lpr
+++ b/components/captcha/demos/simple_demo/simpledemo.lpr
@@ -17,6 +17,7 @@ uses
 
 begin
   RequireDerivedFormResource:=True;
+  Application.Title:='SimpleDemo';
   Application.Scaled:=True;
   Application.Initialize;
   Application.CreateForm(TForm1, Form1);