--- a/README.txt	Wed Aug 04 15:41:26 2010 +0100
+++ b/README.txt	Mon Nov 01 10:36:09 2010 +0000
@@ -25,7 +25,7 @@
 Some notes;
 
 * The source layout for baseport now matches the Symbian Foundation layout, and 
-  will compile correctly if this repository is unpacked to /sf/adaptation/qemu. Eventually
+  will compile correctly if this repository is unpacked to /sf/adapt/qemu. Eventually
   the baseport could move into the kernelhwsrv or boardsupport packages, but that
   would imply changing AsspNKernIncludePath in baseport/syborg/variant.mmh
   

--- a/applications/SymbianLogo_TextShell/README.txt	Wed Aug 04 15:41:26 2010 +0100
+++ b/applications/SymbianLogo_TextShell/README.txt	Mon Nov 01 10:36:09 2010 +0000
@@ -14,7 +14,7 @@
 
 Purpose - Simple TextShell console application which reads image file from filesystem and outputs to display
 
-Build from -  \sf\adaptation\qemu\applications\SymbianLogo_TextShell
+Build from -  \sf\adapt\qemu\applications\SymbianLogo_TextShell
 
 Using command - sbs -b bld.inf -c armv5 -j 1
 
@@ -26,5 +26,5 @@
 
 Then run QEMU from \symbian-qemu-0.9.1\bin using command -
 
-arm-none-symbianelf-qemu-system.exe -kernel \sf\os\kernelhwsrv\kernel\eka\rombuild\syborgarmv5d.img -M \sf\adaptation\qemu\baseport\syborg\syborg.dtb
+arm-none-symbianelf-qemu-system.exe -kernel \sf\os\kernelhwsrv\kernel\eka\rombuild\syborgarmv5d.img -M \sf\adapt\qemu\baseport\syborg\syborg.dtb
 

--- a/applications/SymbianLogo_TextShell/SymbianLogo.cpp	Wed Aug 04 15:41:26 2010 +0100
+++ b/applications/SymbianLogo_TextShell/SymbianLogo.cpp	Mon Nov 01 10:36:09 2010 +0000
@@ -58,7 +58,7 @@
 	//Open file 
 	
 	/*
-	File \sf\adaptation\qemu\baseport\syborg\syborg.dts contains board model description, the hostfs@0 block defines both the host path
+	File \sf\adapt\qemu\baseport\syborg\syborg.dts contains board model description, the hostfs@0 block defines both the host path
 	and target drive. The hostpath is by default set to \svphostfs\ and default drive number is 19 (S:\). If you would like to change this 
 	edit the dts file and use arm-none-symbianelf-dtc.exe to create updated dtb file
 	*/

--- a/baseport/syborg/syborg.mrp	Wed Aug 04 15:41:26 2010 +0100
+++ b/baseport/syborg/syborg.mrp	Mon Nov 01 10:36:09 2010 +0000
@@ -1,10 +1,10 @@
 # component name "Syborg baseport"
 
 component	syborg
-source	\sf\adaptation\qemu\baseport\syborg
+source	\sf\adapt\qemu\baseport\syborg
 
-binary	\sf\adaptation\qemu\baseport\syborg all
-exports	\sf\adaptation\qemu\baseport\syborg
+binary	\sf\adapt\qemu\baseport\syborg all
+exports	\sf\adapt\qemu\baseport\syborg
 
 notes_source	\component_defs\release.src
 

--- a/baseport/syborg/variant.mmh	Wed Aug 04 15:41:26 2010 +0100
+++ b/baseport/syborg/variant.mmh	Mon Nov 01 10:36:09 2010 +0000
@@ -110,7 +110,7 @@
 macro __EMI_SUPPORT__
 
 #define VariantTarget(name,ext)     _syborg_##name##.##ext
-#define AsspNKernIncludePath        /sf/adaptation/qemu/baseport/syborg/specific
+#define AsspNKernIncludePath        /sf/adapt/qemu/baseport/syborg/specific
 #define VariantMediaDefIncludePath  /epoc32/include/syborg        
 #define PlatformLib		   		    kasyborg.lib
 

--- a/package_definition_2.0.1.xml	Wed Aug 04 15:41:26 2010 +0100
+++ b/package_definition_2.0.1.xml	Mon Nov 01 10:36:09 2010 +0000
@@ -72,16 +72,16 @@
   priority CDATA #IMPLIED
 >
 ]>
-<SystemDefinition schema="2.0.1" name="QEMU">
-<systemModel>
-<layer name="anonymous">
-<block name="qemu" long-name="QEMU" levels="hw-if">
-<collection name="baseport" long-name="Baseport" level="hw-if">
-<component name="syborg" long-name="Syborg" introduced="symbian^2" purpose="optional">
-<unit bldFile="/sf/adaptation/qemu/baseport/syborg" mrp="/sf/adaptation/qemu/baseport/syborg/syborg.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
+<SystemDefinition schema="2.0.1" name="QEMU">
+<systemModel>
+<layer name="anonymous">
+<block name="qemu" long-name="QEMU" levels="hw-if">
+<collection name="baseport" long-name="Baseport" level="hw-if">
+<component name="syborg" long-name="Syborg" introduced="symbian^2" purpose="optional">
+<unit bldFile="/sf/adapt/qemu/baseport/syborg" mrp="/sf/adapt/qemu/baseport/syborg/syborg.mrp"/>
+</component>
+</collection>
+</block>
+</layer>
+</systemModel>
+</SystemDefinition>