11 files changed, 8 insertions, 9 deletions
diff --git a/demos/demos.pro b/demos/demos.pro
index c4b8872..4a9d451 100644
--- a/demos/demos.pro
+++ b/demos/demos.pro
@@ -64,7 +64,7 @@ demos_arthurplugin.subdir = arthurplugin
 demos_sqlbrowser.subdir = sqlbrowser
 demos_undo.subdir = undo
 demos_qtdemo.subdir = qtdemo
-demos_mediaplayer.subdir = mediaplayer
+demos_mediaplayer.subdir = qmediaplayer
 
 demos_browser.subdir = browser
 
diff --git a/demos/embedded/fluidlauncher/config_s60/config.xml b/demos/embedded/fluidlauncher/config_s60/config.xml
index fefa3dd..2c61baf 100644
--- a/demos/embedded/fluidlauncher/config_s60/config.xml
+++ b/demos/embedded/fluidlauncher/config_s60/config.xml
@@ -6,7 +6,7 @@
     <example filename="deform" name="Vector Deformation" image="screenshots/deform.png" args="-small-screen"/>
     <example filename="pathstroke" name="Path Stroking" image="screenshots/pathstroke.png" args="-small-screen"/>
     <example filename="wiggly" name="Wiggly Text" image="screenshots/wiggly_s60.png" args="-small-screen"/>
-    <example filename="ftp" name="Ftp Client" image="screenshots/ftp_s60.png"/>
+    <example filename="qftp" name="Ftp Client" image="screenshots/ftp_s60.png"/>
     <example filename="context2d" name="Context2d" image="screenshots/context2d_s60.png" args="-small-screen"/>
     <example filename="saxbookmarks" name="SaxBookmarks" image="screenshots/saxbookmarks_s60.png"/>
     <example filename="desktopservices" name="Desktop Services" image="screenshots/desktopservices_s60.png"/>
diff --git a/demos/embedded/fluidlauncher/fluidlauncher.pro b/demos/embedded/fluidlauncher/fluidlauncher.pro
index f2abde6..dd931e6 100644
--- a/demos/embedded/fluidlauncher/fluidlauncher.pro
+++ b/demos/embedded/fluidlauncher/fluidlauncher.pro
@@ -66,7 +66,7 @@ symbian {
         deform.exe \
         pathstroke.exe \
         wiggly.exe \
-        ftp.exe \
+        qftp.exe \
         saxbookmarks.exe \
         desktopservices.exe \
         fridgemagnets.exe \
@@ -85,7 +85,7 @@ symbian {
         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/deform_reg.rsc \
         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/pathstroke_reg.rsc \
         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/wiggly_reg.rsc \
-        $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/ftp_reg.rsc\
+        $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/qftp_reg.rsc\
         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/saxbookmarks_reg.rsc \
         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/desktopservices_reg.rsc \
         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/fridgemagnets_reg.rsc \
@@ -109,7 +109,7 @@ symbian {
         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/deform.rsc \
         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/pathstroke.rsc \
         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/wiggly.rsc \
-        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/ftp.rsc\
+        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/qftp.rsc\
         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/saxbookmarks.rsc \
         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/desktopservices.rsc \
         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/fridgemagnets.rsc \
diff --git a/demos/mediaplayer/images/screen.png b/demos/qmediaplayer/images/screen.png
index a15df92..a15df92 100644
--- a/demos/mediaplayer/images/screen.png
+++ b/demos/qmediaplayer/images/screen.png
diff --git a/demos/mediaplayer/main.cpp b/demos/qmediaplayer/main.cpp
index 66aa445..66aa445 100644
--- a/demos/mediaplayer/main.cpp
+++ b/demos/qmediaplayer/main.cpp
diff --git a/demos/mediaplayer/mediaplayer.cpp b/demos/qmediaplayer/mediaplayer.cpp
index baac236..baac236 100644
--- a/demos/mediaplayer/mediaplayer.cpp
+++ b/demos/qmediaplayer/mediaplayer.cpp
diff --git a/demos/mediaplayer/mediaplayer.h b/demos/qmediaplayer/mediaplayer.h
index 40ffa40..40ffa40 100644
--- a/demos/mediaplayer/mediaplayer.h
+++ b/demos/qmediaplayer/mediaplayer.h
diff --git a/demos/mediaplayer/mediaplayer.qrc b/demos/qmediaplayer/mediaplayer.qrc
index bcdf404..bcdf404 100644
--- a/demos/mediaplayer/mediaplayer.qrc
+++ b/demos/qmediaplayer/mediaplayer.qrc
diff --git a/demos/mediaplayer/mediaplayer.pro b/demos/qmediaplayer/qmediaplayer.pro
index a420cc3..2f15c28 100644
--- a/demos/mediaplayer/mediaplayer.pro
+++ b/demos/qmediaplayer/qmediaplayer.pro
@@ -3,7 +3,6 @@
 ######################################################################
 
 TEMPLATE = app
-TARGET = qmediaplayer
 DEPENDPATH += . build src ui
 
 QT += phonon
@@ -18,7 +17,7 @@ HEADERS += mediaplayer.h
 
 target.path = $$[QT_INSTALL_DEMOS]/qmediaplayer
 sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.html *.doc images
-sources.path = $$[QT_INSTALL_DEMOS]/mediaplayer
+sources.path = $$[QT_INSTALL_DEMOS]/qmediaplayer
 INSTALLS += target sources
 
 wince*{
diff --git a/demos/mediaplayer/settings.ui b/demos/qmediaplayer/settings.ui
index d2cedd4..d2cedd4 100644
--- a/demos/mediaplayer/settings.ui
+++ b/demos/qmediaplayer/settings.ui
diff --git a/demos/qtdemo/xml/examples.xml b/demos/qtdemo/xml/examples.xml
index 3f0cd25..2c31484 100644
--- a/demos/qtdemo/xml/examples.xml
+++ b/demos/qtdemo/xml/examples.xml
@@ -121,7 +121,7 @@
     <example filename="network-chat" name="Network Chat Client" />
     <example filename="fortuneclient" name="Fortune Client" />
     <example filename="fortuneserver" name="Fortune Server" />
-    <example filename="ftp" changedirectory="false" name="FTP Client" />
+    <example filename="qftp" changedirectory="false" name="FTP Client" />
     <example filename="http" changedirectory="false" name="HTTP Client" />
     <example filename="loopback" name="Loopback" />
     <example filename="threadedfortuneserver" name="Threaded Fort. Server" />
@@ -152,7 +152,7 @@
     <example filename="transformations" name="Transformations" />
   </category>
   <category dirname="phonon" name="Phonon">
-    <example filename="musicplayer" name="Music Player" />
+    <example filename="qmusicplayer" name="Music Player" />
   </category>
   <category dirname="multimedia/audio" name="Multimedia">
     <example filename="audiodevices" name="Audio Devices" />