Renaming the forms in the simple demos.

demos/simplefmx/SimpleMain.fmx

@@ -1,7 +1,7 @@
-object Form2: TForm2
+object frmSimpleMain: TfrmSimpleMain
   Left = 0
   Top = 0
-  Caption = 'Form2'
+  Caption = 'Simple QR Generator'
   ClientHeight = 438
   ClientWidth = 401
   FormFactor.Width = 320

demos/simplefmx/SimpleMain.pas

@@ -8,7 +8,7 @@ uses
   FMX.Controls.Presentation, FMX.Edit, FMX.Objects;
 
 type
-  TForm2 = class(TForm)
+  TfrmSimpleMain = class(TForm)
     txtData: TEdit;
     imgQR: TImage;
     procedure txtDataChangeTracking(Sender: TObject);
@@ -19,7 +19,7 @@ type
   end;
 
 var
-  Form2: TForm2;
+  frmSimpleMain: TfrmSimpleMain;
 
 implementation
 
@@ -27,7 +27,7 @@ uses qr.code.fmx;
 
 {$R *.fmx}
 
-procedure TForm2.txtDataChangeTracking(Sender: TObject);
+procedure TfrmSimpleMain.txtDataChangeTracking(Sender: TObject);
 var
   bmp : TQRBitmap;
 begin

demos/simplefmx/SimpleQRFMX.dpr

@@ -3,12 +3,12 @@ program SimpleQRFMX;
 uses
   System.StartUpCopy,
   FMX.Forms,
-  SimpleMain in 'SimpleMain.pas' {Form2};
+  SimpleMain in 'SimpleMain.pas' {frmSimpleMain};
 
 {$R *.res}
 
 begin
   Application.Initialize;
-  Application.CreateForm(TForm2, Form2);
+  Application.CreateForm(TfrmSimpleMain, frmSimpleMain);
   Application.Run;
 end.

demos/simplefmx/SimpleQRFMX.dproj

@@ -377,7 +377,7 @@
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
         <DCCReference Include="SimpleMain.pas">
-            <Form>Form2</Form>
+            <Form>frmSimpleMain</Form>
             <FormType>fmx</FormType>
         </DCCReference>
         <BuildConfiguration Include="Release">
@@ -413,15 +413,15 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="$(BDS)\bin\delphi_PROJECTICNS.icns" Configuration="Debug" Class="ProjectOSXResource">
+                <DeployFile LocalName="..\..\bin\OSX64\SimpleQRFMX.info.plist" Configuration="Debug" Class="ProjectOSXInfoPList">
                     <Platform Name="OSX64">
-                        <RemoteName>SimpleQRFMX.icns</RemoteName>
+                        <RemoteName>Info.plist</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="..\..\bin\OSX64\SimpleQRFMX.info.plist" Configuration="Debug" Class="ProjectOSXInfoPList">
+                <DeployFile LocalName="$(BDS)\bin\delphi_PROJECTICNS.icns" Configuration="Debug" Class="ProjectOSXResource">
                     <Platform Name="OSX64">
-                        <RemoteName>Info.plist</RemoteName>
+                        <RemoteName>SimpleQRFMX.icns</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>

demos/simplevcl/SimpleMain.dfm

@@ -1,4 +1,4 @@
-object Form1: TForm1
+object frmSimpleMain: TfrmSimpleMain
   Left = 0
   Top = 0
   Caption = 'Simple QR Example'

demos/simplevcl/SimpleMain.pas

@@ -7,7 +7,7 @@ uses
   Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.ExtCtrls, Vcl.StdCtrls;
 
 type
-  TForm1 = class(TForm)
+  TfrmSimpleMain = class(TForm)
     txtData: TEdit;
     imgQR: TImage;
     procedure txtDataChange(Sender: TObject);
@@ -19,7 +19,7 @@ type
   end;
 
 var
-  Form1: TForm1;
+  frmSimpleMain: TfrmSimpleMain;
 
 implementation
 
@@ -27,12 +27,12 @@ uses qr.code.vcl;
 
 {$R *.dfm}
 
-procedure TForm1.FormCreate(Sender: TObject);
+procedure TfrmSimpleMain.FormCreate(Sender: TObject);
 begin
   txtDataChange(nil);
 end;
 
-procedure TForm1.txtDataChange(Sender: TObject);
+procedure TfrmSimpleMain.txtDataChange(Sender: TObject);
 var
   bmp : TQRBitmap;
 begin

demos/simplevcl/SimpleQRVCL.dpr

@@ -2,13 +2,13 @@ program SimpleQRVCL;
 
 uses
   Vcl.Forms,
-  SimpleMain in 'SimpleMain.pas' {Form1};
+  SimpleMain in 'SimpleMain.pas' {frmSimpleMain};
 
 {$R *.res}
 
 begin
   Application.Initialize;
   Application.MainFormOnTaskbar := True;
-  Application.CreateForm(TForm1, Form1);
+  Application.CreateForm(TfrmSimpleMain, frmSimpleMain);
   Application.Run;
 end.

demos/simplevcl/SimpleQRVCL.dproj

@@ -104,7 +104,7 @@
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
         <DCCReference Include="SimpleMain.pas">
-            <Form>Form1</Form>
+            <Form>frmSimpleMain</Form>
             <FormType>dfm</FormType>
         </DCCReference>
         <BuildConfiguration Include="Release">