6 files changed, 19 insertions, 20 deletions
diff --git a/examples/corelib/canvastest/fpgcanvas.lpi b/examples/corelib/canvastest/fpgcanvas.lpi
index 3bc36356..56117be1 100644
--- a/examples/corelib/canvastest/fpgcanvas.lpi
+++ b/examples/corelib/canvastest/fpgcanvas.lpi
@@ -41,10 +41,9 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
+    <Version Value="8"/>
     <CodeGeneration>
       <SmartLinkUnit Value="True"/>
-      <Generate Value="Faster"/>
     </CodeGeneration>
     <Linking>
       <LinkSmart Value="True"/>
diff --git a/examples/corelib/canvastest/fpgcanvas.lpr b/examples/corelib/canvastest/fpgcanvas.lpr
index bf721f28..5db95e09 100644
--- a/examples/corelib/canvastest/fpgcanvas.lpr
+++ b/examples/corelib/canvastest/fpgcanvas.lpr
@@ -7,10 +7,10 @@ uses
   cthreads,
   {$ENDIF}{$ENDIF}
   Classes, SysUtils,
-  gfxbase,
-  fpgfx,
-  gui_form,
-  gfx_imgfmt_bmp;
+  fpg_base,
+  fpg_main,
+  fpg_form,
+  fpg_imgfmt_bmp;
 
 
 type
diff --git a/examples/corelib/eventtest/eventtest.lpi b/examples/corelib/eventtest/eventtest.lpi
index b1ac640a..b982410c 100644
--- a/examples/corelib/eventtest/eventtest.lpi
+++ b/examples/corelib/eventtest/eventtest.lpi
@@ -40,7 +40,7 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
+    <Version Value="8"/>
     <CodeGeneration>
       <SmartLinkUnit Value="True"/>
       <Optimizations>
diff --git a/examples/corelib/eventtest/eventtest.lpr b/examples/corelib/eventtest/eventtest.lpr
index bdd69c68..baac5d80 100644
--- a/examples/corelib/eventtest/eventtest.lpr
+++ b/examples/corelib/eventtest/eventtest.lpr
@@ -6,7 +6,10 @@ uses
   {$IFDEF UNIX}{$IFDEF UseCThreads}
   cthreads,
   {$ENDIF}{$ENDIF}
-  Classes, SysUtils, GFXBase, fpGFX, gfx_widget;
+  Classes, SysUtils,
+  fpg_base,
+  fpg_main,
+  fpg_widget;
   
 
 const
diff --git a/examples/corelib/helloworld/helloworld.lpi b/examples/corelib/helloworld/helloworld.lpi
index fccf438a..1b678005 100644
--- a/examples/corelib/helloworld/helloworld.lpi
+++ b/examples/corelib/helloworld/helloworld.lpi
@@ -40,10 +40,7 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
+    <Version Value="8"/>
     <Other>
       <CustomOptions Value="-FUunits"/>
       <CompilerPath Value="$(CompPath)"/>
diff --git a/examples/corelib/helloworld/helloworld.pas b/examples/corelib/helloworld/helloworld.pas
index ef8eee98..be6b99c3 100644
--- a/examples/corelib/helloworld/helloworld.pas
+++ b/examples/corelib/helloworld/helloworld.pas
@@ -1,9 +1,7 @@
 {
-    fpGUI  -  Free Pascal GUI Library
+    fpGUI  -  Free Pascal GUI Toolkit
 
-    HelloWorld  -  GFX Hello World application
-
-    Copyright (C) 2007 See the file AUTHORS.txt, included in this
+    Copyright (C) 2006 - 2008 See the file AUTHORS.txt, included in this
     distribution, for details of the copyright.
 
     See the file COPYING.modifiedLGPL, included in this distribution,
@@ -12,6 +10,9 @@
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+    Description:
+      A simple hello world application that only uses canvas painting.
 }
 
 program HelloWorld;
@@ -19,10 +20,9 @@ program HelloWorld;
 {$mode objfpc}{$H+}
 
 uses
-  Classes
-  ,fpGFX
-  ,GFXBase
-  , fpgui_toolkit;
+  Classes,
+  fpg_base,
+  fpg_main;
 
 const
   HelloWorldString: String = 'Hello, world!';