QtMediaservices -> QtMediaServices.

Reviewed-by: Dmytro Poplavskiy

55 files changed, 164 insertions, 164 deletions

diff --git a/src/multimedia/mediaservices/base/qgraphicsvideoitem.cpp b/src/multimedia/mediaservices/base/qgraphicsvideoitem.cpp
index 8494c2e..d80dec5 100644
--- a/src/multimedia/mediaservices/base/qgraphicsvideoitem.cpp
+++ b/src/multimedia/mediaservices/base/qgraphicsvideoitem.cpp
@@ -39,13 +39,13 @@
 **
 ****************************************************************************/
 
-#include <QtMediaservices/qgraphicsvideoitem.h>
+#include <QtMediaServices/qgraphicsvideoitem.h>
 
-#include <QtMediaservices/qmediaobject.h>
-#include <QtMediaservices/qmediaservice.h>
-#include <QtMediaservices/private/qpaintervideosurface_p.h>
-#include <QtMediaservices/qvideooutputcontrol.h>
-#include <QtMediaservices/qvideorenderercontrol.h>
+#include <QtMediaServices/qmediaobject.h>
+#include <QtMediaServices/qmediaservice.h>
+#include <QtMediaServices/private/qpaintervideosurface_p.h>
+#include <QtMediaServices/qvideooutputcontrol.h>
+#include <QtMediaServices/qvideorenderercontrol.h>
 #include <QtMultimedia/qvideosurfaceformat.h>
 
 #if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_1_CL) && !defined(QT_OPENGL_ES_1)
diff --git a/src/multimedia/mediaservices/base/qgraphicsvideoitem.h b/src/multimedia/mediaservices/base/qgraphicsvideoitem.h
index 62e66e8..bb41075 100644
--- a/src/multimedia/mediaservices/base/qgraphicsvideoitem.h
+++ b/src/multimedia/mediaservices/base/qgraphicsvideoitem.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -44,7 +44,7 @@
 
 #include <QtGui/qgraphicsitem.h>
 
-#include <QtMediaservices/qvideowidget.h>
+#include <QtMediaServices/qvideowidget.h>
 
 #if !defined(QT_NO_GRAPHICSVIEW) || (QT_EDITION & QT_MODULE_GRAPHICSVIEW) != QT_MODULE_GRAPHICSVIEW
 
diff --git a/src/multimedia/mediaservices/base/qlocalmediaplaylistprovider.cpp b/src/multimedia/mediaservices/base/qlocalmediaplaylistprovider.cpp
index 818b285..51e3bfb 100644
--- a/src/multimedia/mediaservices/base/qlocalmediaplaylistprovider.cpp
+++ b/src/multimedia/mediaservices/base/qlocalmediaplaylistprovider.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices  module of the Qt Toolkit.
+** This file is part of the QtMediaServices  module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include <QtMediaservices/qlocalmediaplaylistprovider.h>
+#include <QtMediaServices/qlocalmediaplaylistprovider.h>
 #include "qmediaplaylistprovider_p.h"
-#include <QtMediaservices/qmediacontent.h>
+#include <QtMediaServices/qmediacontent.h>
 
 
 QT_BEGIN_NAMESPACE
diff --git a/src/multimedia/mediaservices/base/qlocalmediaplaylistprovider.h b/src/multimedia/mediaservices/base/qlocalmediaplaylistprovider.h
index 73ff82d..e6b6dca 100644
--- a/src/multimedia/mediaservices/base/qlocalmediaplaylistprovider.h
+++ b/src/multimedia/mediaservices/base/qlocalmediaplaylistprovider.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -42,7 +42,7 @@
 #ifndef QLOCALMEDIAPAYLISTPROVIDER_H
 #define QLOCALMEDIAPAYLISTPROVIDER_H
 
-#include <QtMediaservices/qmediaplaylistprovider.h>
+#include <QtMediaServices/qmediaplaylistprovider.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/mediaservices/base/qmediacontent.cpp b/src/multimedia/mediaservices/base/qmediacontent.cpp
index f89e901..50d8e46 100644
--- a/src/multimedia/mediaservices/base/qmediacontent.cpp
+++ b/src/multimedia/mediaservices/base/qmediacontent.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -42,7 +42,7 @@
 #include <QtCore/qurl.h>
 #include <QtCore/qvariant.h>
 
-#include <QtMediaservices/qmediacontent.h>
+#include <QtMediaServices/qmediacontent.h>
 
 
 QT_BEGIN_NAMESPACE
diff --git a/src/multimedia/mediaservices/base/qmediacontent.h b/src/multimedia/mediaservices/base/qmediacontent.h
index 20f0525..47fa6e1 100644
--- a/src/multimedia/mediaservices/base/qmediacontent.h
+++ b/src/multimedia/mediaservices/base/qmediacontent.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -45,7 +45,7 @@
 #include <QtCore/qmetatype.h>
 #include <QtCore/qshareddata.h>
 
-#include <QtMediaservices/qmediaresource.h>
+#include <QtMediaServices/qmediaresource.h>
 #include <QtNetwork/qnetworkrequest.h>
 
 
diff --git a/src/multimedia/mediaservices/base/qmediacontrol.cpp b/src/multimedia/mediaservices/base/qmediacontrol.cpp
index 98db9fe..09996c8 100644
--- a/src/multimedia/mediaservices/base/qmediacontrol.cpp
+++ b/src/multimedia/mediaservices/base/qmediacontrol.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -42,8 +42,8 @@
 #include <QtCore/qmetaobject.h>
 #include <QtCore/qtimer.h>
 
-#include <QtMediaservices//qmediacontrol.h>
-#include <QtMediaservices/private/qmediacontrol_p.h>
+#include <QtMediaServices//qmediacontrol.h>
+#include <QtMediaServices/private/qmediacontrol_p.h>
 
 
 
diff --git a/src/multimedia/mediaservices/base/qmediacontrol.h b/src/multimedia/mediaservices/base/qmediacontrol.h
index be5d95d..819c959 100644
--- a/src/multimedia/mediaservices/base/qmediacontrol.h
+++ b/src/multimedia/mediaservices/base/qmediacontrol.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/src/multimedia/mediaservices/base/qmediacontrol_p.h b/src/multimedia/mediaservices/base/qmediacontrol_p.h
index ad7e947..3f9755b 100644
--- a/src/multimedia/mediaservices/base/qmediacontrol_p.h
+++ b/src/multimedia/mediaservices/base/qmediacontrol_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/src/multimedia/mediaservices/base/qmediaobject.cpp b/src/multimedia/mediaservices/base/qmediaobject.cpp
index 3d92b12..68fb29e 100644
--- a/src/multimedia/mediaservices/base/qmediaobject.cpp
+++ b/src/multimedia/mediaservices/base/qmediaobject.cpp
@@ -43,8 +43,8 @@
 
 #include "qmediaobject_p.h"
 
-#include <QtMediaservices/qmediaservice.h>
-#include <QtMediaservices/qmetadatacontrol.h>
+#include <QtMediaServices/qmediaservice.h>
+#include <QtMediaServices/qmetadatacontrol.h>
 
 
 QT_BEGIN_NAMESPACE
@@ -97,9 +97,9 @@ QMediaObject::~QMediaObject()
     Returns the service availability error state.
 */
 
-QtMediaservices::AvailabilityError QMediaObject::availabilityError() const
+QtMediaServices::AvailabilityError QMediaObject::availabilityError() const
 {
-    return QtMediaservices::ServiceMissingError;
+    return QtMediaServices::ServiceMissingError;
 }
 
 /*!
@@ -306,7 +306,7 @@ bool QMediaObject::isMetaDataWritable() const
 /*!
     Returns the value associated with a meta-data \a key.
 */
-QVariant QMediaObject::metaData(QtMediaservices::MetaData key) const
+QVariant QMediaObject::metaData(QtMediaServices::MetaData key) const
 {
     Q_D(const QMediaObject);
 
@@ -318,7 +318,7 @@ QVariant QMediaObject::metaData(QtMediaservices::MetaData key) const
 /*!
     Sets a \a value for a meta-data \a key.
 */
-void QMediaObject::setMetaData(QtMediaservices::MetaData key, const QVariant &value)
+void QMediaObject::setMetaData(QtMediaServices::MetaData key, const QVariant &value)
 {
     Q_D(QMediaObject);
 
@@ -329,13 +329,13 @@ void QMediaObject::setMetaData(QtMediaservices::MetaData key, const QVariant &va
 /*!
     Returns a list of keys there is meta-data available for.
 */
-QList<QtMediaservices::MetaData> QMediaObject::availableMetaData() const
+QList<QtMediaServices::MetaData> QMediaObject::availableMetaData() const
 {
     Q_D(const QMediaObject);
 
     return d->metaDataControl
             ? d->metaDataControl->availableMetaData()
-            : QList<QtMediaservices::MetaData>();
+            : QList<QtMediaServices::MetaData>();
 }
 
 /*!
diff --git a/src/multimedia/mediaservices/base/qmediaobject.h b/src/multimedia/mediaservices/base/qmediaobject.h
index 461e056..70b4f33 100644
--- a/src/multimedia/mediaservices/base/qmediaobject.h
+++ b/src/multimedia/mediaservices/base/qmediaobject.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -45,7 +45,7 @@
 #include <QtCore/qobject.h>
 #include <QtCore/qstringlist.h>
 
-#include <QtMediaservices/qtmedianamespace.h>
+#include <QtMediaServices/qtmedianamespace.h>
 
 QT_BEGIN_HEADER
 
@@ -67,7 +67,7 @@ public:
     ~QMediaObject();
 
     virtual bool isAvailable() const;
-    virtual QtMediaservices::AvailabilityError availabilityError() const;
+    virtual QtMediaServices::AvailabilityError availabilityError() const;
 
     virtual QMediaService* service() const;
 
@@ -80,9 +80,9 @@ public:
     bool isMetaDataAvailable() const;
     bool isMetaDataWritable() const;
 
-    QVariant metaData(QtMediaservices::MetaData key) const;
-    void setMetaData(QtMediaservices::MetaData key, const QVariant &value);
-    QList<QtMediaservices::MetaData> availableMetaData() const;
+    QVariant metaData(QtMediaServices::MetaData key) const;
+    void setMetaData(QtMediaServices::MetaData key, const QVariant &value);
+    QList<QtMediaServices::MetaData> availableMetaData() const;
 
     QVariant extendedMetaData(const QString &key) const;
     void setExtendedMetaData(const QString &key, const QVariant &value);
diff --git a/src/multimedia/mediaservices/base/qmediaobject_p.h b/src/multimedia/mediaservices/base/qmediaobject_p.h
index 4589f03..c31ad46 100644
--- a/src/multimedia/mediaservices/base/qmediaobject_p.h
+++ b/src/multimedia/mediaservices/base/qmediaobject_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -57,7 +57,7 @@
 #include <QtCore/qset.h>
 #include <QtCore/qtimer.h>
 
-#include <QtMediaservices/qmediaobject.h>
+#include <QtMediaServices/qmediaobject.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/mediaservices/base/qmediaplaylist.cpp b/src/multimedia/mediaservices/base/qmediaplaylist.cpp
index 174a8ac..93278fe 100644
--- a/src/multimedia/mediaservices/base/qmediaplaylist.cpp
+++ b/src/multimedia/mediaservices/base/qmediaplaylist.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -45,14 +45,14 @@
 #include <QtCore/qcoreevent.h>
 #include <QtCore/qcoreapplication.h>
 
-#include <QtMediaservices/qmediaplaylist.h>
+#include <QtMediaServices/qmediaplaylist.h>
 #include "qmediaplaylist_p.h"
-#include <QtMediaservices/qmediaplaylistprovider.h>
-#include <QtMediaservices/qlocalmediaplaylistprovider.h>
-#include <QtMediaservices/qmediaplaylistioplugin.h>
-#include <QtMediaservices/qmediaservice.h>
-#include <QtMediaservices/qmediaplaylistcontrol.h>
-#include <QtMediaservices/qmediaplayercontrol.h>
+#include <QtMediaServices/qmediaplaylistprovider.h>
+#include <QtMediaServices/qlocalmediaplaylistprovider.h>
+#include <QtMediaServices/qmediaplaylistioplugin.h>
+#include <QtMediaServices/qmediaservice.h>
+#include <QtMediaServices/qmediaplaylistcontrol.h>
+#include <QtMediaServices/qmediaplayercontrol.h>
 
 #include "qmediapluginloader_p.h"
 
diff --git a/src/multimedia/mediaservices/base/qmediaplaylist.h b/src/multimedia/mediaservices/base/qmediaplaylist.h
index 132b58c..9125fd6 100644
--- a/src/multimedia/mediaservices/base/qmediaplaylist.h
+++ b/src/multimedia/mediaservices/base/qmediaplaylist.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -44,8 +44,8 @@
 
 #include <QtCore/qobject.h>
 
-#include <QtMediaservices/qmediacontent.h>
-#include <QtMediaservices/qmediaobject.h>
+#include <QtMediaServices/qmediacontent.h>
+#include <QtMediaServices/qmediaobject.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/multimedia/mediaservices/base/qmediaplaylist_p.h b/src/multimedia/mediaservices/base/qmediaplaylist_p.h
index 57c2723..a5f290e 100644
--- a/src/multimedia/mediaservices/base/qmediaplaylist_p.h
+++ b/src/multimedia/mediaservices/base/qmediaplaylist_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -53,11 +53,11 @@
 // We mean it.
 //
 
-#include <QtMediaservices/qmediaplaylist.h>
-#include <QtMediaservices/qmediaplaylistcontrol.h>
-#include <QtMediaservices/qmediaplayer.h>
-#include <QtMediaservices/qmediaplayercontrol.h>
-#include <QtMediaservices/qlocalmediaplaylistprovider.h>
+#include <QtMediaServices/qmediaplaylist.h>
+#include <QtMediaServices/qmediaplaylistcontrol.h>
+#include <QtMediaServices/qmediaplayer.h>
+#include <QtMediaServices/qmediaplayercontrol.h>
+#include <QtMediaServices/qlocalmediaplaylistprovider.h>
 #include "qmediaobject_p.h"
 
 #include <QtCore/qdebug.h>
diff --git a/src/multimedia/mediaservices/base/qmediaplaylistcontrol.cpp b/src/multimedia/mediaservices/base/qmediaplaylistcontrol.cpp
index 6f3b2fe..016c55d 100644
--- a/src/multimedia/mediaservices/base/qmediaplaylistcontrol.cpp
+++ b/src/multimedia/mediaservices/base/qmediaplaylistcontrol.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 
-#include <QtMediaservices/qmediaplaylistcontrol.h>
+#include <QtMediaServices/qmediaplaylistcontrol.h>
 #include "qmediacontrol_p.h"
 
 
diff --git a/src/multimedia/mediaservices/base/qmediaplaylistcontrol.h b/src/multimedia/mediaservices/base/qmediaplaylistcontrol.h
index cf489e3..36f00ae 100644
--- a/src/multimedia/mediaservices/base/qmediaplaylistcontrol.h
+++ b/src/multimedia/mediaservices/base/qmediaplaylistcontrol.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -43,8 +43,8 @@
 #ifndef QMEDIAPLAYLISTCONTROL_H
 #define QMEDIAPLAYLISTCONTROL_H
 
-#include <QtMediaservices/qmediacontrol.h>
-#include <QtMediaservices/qmediaplaylistnavigator.h>
+#include <QtMediaServices/qmediacontrol.h>
+#include <QtMediaServices/qmediaplaylistnavigator.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/multimedia/mediaservices/base/qmediaplaylistioplugin.cpp b/src/multimedia/mediaservices/base/qmediaplaylistioplugin.cpp
index ba5dc81..60e80e5 100644
--- a/src/multimedia/mediaservices/base/qmediaplaylistioplugin.cpp
+++ b/src/multimedia/mediaservices/base/qmediaplaylistioplugin.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtMediaservices/qmediaplaylistioplugin.h>
+#include <QtMediaServices/qmediaplaylistioplugin.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/multimedia/mediaservices/base/qmediaplaylistioplugin.h b/src/multimedia/mediaservices/base/qmediaplaylistioplugin.h
index 6bc0418..5fc10f7 100644
--- a/src/multimedia/mediaservices/base/qmediaplaylistioplugin.h
+++ b/src/multimedia/mediaservices/base/qmediaplaylistioplugin.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -46,7 +46,7 @@
 #include <QtCore/qplugin.h>
 #include <QtCore/qfactoryinterface.h>
 
-#include <QtMediaservices/qmediacontent.h>
+#include <QtMediaServices/qmediacontent.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/multimedia/mediaservices/base/qmediaplaylistnavigator.cpp b/src/multimedia/mediaservices/base/qmediaplaylistnavigator.cpp
index 134ae77..e3eec5e 100644
--- a/src/multimedia/mediaservices/base/qmediaplaylistnavigator.cpp
+++ b/src/multimedia/mediaservices/base/qmediaplaylistnavigator.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include <QtMediaservices/qmediaplaylistnavigator.h>
-#include <QtMediaservices/qmediaplaylistprovider.h>
-#include <QtMediaservices/qmediaplaylist.h>
+#include <QtMediaServices/qmediaplaylistnavigator.h>
+#include <QtMediaServices/qmediaplaylistprovider.h>
+#include <QtMediaServices/qmediaplaylist.h>
 #include "qmediaobject_p.h"
 
 #include <QtCore/qdebug.h>
diff --git a/src/multimedia/mediaservices/base/qmediaplaylistnavigator.h b/src/multimedia/mediaservices/base/qmediaplaylistnavigator.h
index b6d3d96..6cb9d9c 100644
--- a/src/multimedia/mediaservices/base/qmediaplaylistnavigator.h
+++ b/src/multimedia/mediaservices/base/qmediaplaylistnavigator.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -44,8 +44,8 @@
 
 #include <QtCore/qobject.h>
 
-#include <QtMediaservices/qmediaplaylistprovider.h>
-#include <QtMediaservices/qmediaplaylist.h>
+#include <QtMediaServices/qmediaplaylistprovider.h>
+#include <QtMediaServices/qmediaplaylist.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/multimedia/mediaservices/base/qmediaplaylistprovider.cpp b/src/multimedia/mediaservices/base/qmediaplaylistprovider.cpp
index c546899..3cd766b 100644
--- a/src/multimedia/mediaservices/base/qmediaplaylistprovider.cpp
+++ b/src/multimedia/mediaservices/base/qmediaplaylistprovider.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -41,7 +41,7 @@
 
 #include <QtCore/qurl.h>
 
-#include <QtMediaservices/qmediaplaylistprovider.h>
+#include <QtMediaServices/qmediaplaylistprovider.h>
 #include "qmediaplaylistprovider_p.h"
 
 
diff --git a/src/multimedia/mediaservices/base/qmediaplaylistprovider.h b/src/multimedia/mediaservices/base/qmediaplaylistprovider.h
index 4929287..31e6d5f 100644
--- a/src/multimedia/mediaservices/base/qmediaplaylistprovider.h
+++ b/src/multimedia/mediaservices/base/qmediaplaylistprovider.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -44,8 +44,8 @@
 
 #include <QtCore/qobject.h>
 
-#include <QtMediaservices/qmediacontent.h>
-#include <QtMediaservices/qmediaplaylist.h>
+#include <QtMediaServices/qmediacontent.h>
+#include <QtMediaServices/qmediaplaylist.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/multimedia/mediaservices/base/qmediaplaylistprovider_p.h b/src/multimedia/mediaservices/base/qmediaplaylistprovider_p.h
index 03f72ac..00d1cca 100644
--- a/src/multimedia/mediaservices/base/qmediaplaylistprovider_p.h
+++ b/src/multimedia/mediaservices/base/qmediaplaylistprovider_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include <QtMediaservices/qmediaplaylist.h>
+#include <QtMediaServices/qmediaplaylist.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/mediaservices/base/qmediapluginloader.cpp b/src/multimedia/mediaservices/base/qmediapluginloader.cpp
index a1975ab..d6da0ba 100644
--- a/src/multimedia/mediaservices/base/qmediapluginloader.cpp
+++ b/src/multimedia/mediaservices/base/qmediapluginloader.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -45,7 +45,7 @@
 #include <QtCore/qdir.h>
 #include <QtCore/qdebug.h>
 
-#include <QtMediaservices/qmediaserviceproviderplugin.h>
+#include <QtMediaServices/qmediaserviceproviderplugin.h>
 
 
 QT_BEGIN_NAMESPACE
diff --git a/src/multimedia/mediaservices/base/qmediapluginloader_p.h b/src/multimedia/mediaservices/base/qmediapluginloader_p.h
index 194f6ee..d911180 100644
--- a/src/multimedia/mediaservices/base/qmediapluginloader_p.h
+++ b/src/multimedia/mediaservices/base/qmediapluginloader_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/src/multimedia/mediaservices/base/qmediaresource.cpp b/src/multimedia/mediaservices/base/qmediaresource.cpp
index 9577092..33bd396 100644
--- a/src/multimedia/mediaservices/base/qmediaresource.cpp
+++ b/src/multimedia/mediaservices/base/qmediaresource.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -43,7 +43,7 @@
 #include <QtCore/qurl.h>
 #include <QtCore/qvariant.h>
 
-#include <QtMediaservices/qmediaresource.h>
+#include <QtMediaServices/qmediaresource.h>
 
 
 QT_BEGIN_NAMESPACE
diff --git a/src/multimedia/mediaservices/base/qmediaresource.h b/src/multimedia/mediaservices/base/qmediaresource.h
index 69078cc..5c381ba 100644
--- a/src/multimedia/mediaservices/base/qmediaresource.h
+++ b/src/multimedia/mediaservices/base/qmediaresource.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/src/multimedia/mediaservices/base/qmediaservice.cpp b/src/multimedia/mediaservices/base/qmediaservice.cpp
index 5d522dc..b343887 100644
--- a/src/multimedia/mediaservices/base/qmediaservice.cpp
+++ b/src/multimedia/mediaservices/base/qmediaservice.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -41,7 +41,7 @@
 
 #include <QtCore/qtimer.h>
 
-#include <QtMediaservices/qmediaservice.h>
+#include <QtMediaServices/qmediaservice.h>
 #include "qmediaservice_p.h"
 
 
diff --git a/src/multimedia/mediaservices/base/qmediaservice.h b/src/multimedia/mediaservices/base/qmediaservice.h
index 060019b..3963348 100644
--- a/src/multimedia/mediaservices/base/qmediaservice.h
+++ b/src/multimedia/mediaservices/base/qmediaservice.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -45,7 +45,7 @@
 #include <QtCore/qobject.h>
 #include <QtCore/qstringlist.h>
 
-#include <QtMediaservices/qmediacontrol.h>
+#include <QtMediaServices/qmediacontrol.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/mediaservices/base/qmediaservice_p.h b/src/multimedia/mediaservices/base/qmediaservice_p.h
index e60e669..bebae11 100644
--- a/src/multimedia/mediaservices/base/qmediaservice_p.h
+++ b/src/multimedia/mediaservices/base/qmediaservice_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/src/multimedia/mediaservices/base/qmediaserviceprovider.cpp b/src/multimedia/mediaservices/base/qmediaserviceprovider.cpp
index 48d245d..f27628b 100644
--- a/src/multimedia/mediaservices/base/qmediaserviceprovider.cpp
+++ b/src/multimedia/mediaservices/base/qmediaserviceprovider.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -42,11 +42,11 @@
 #include <QtCore/qdebug.h>
 #include <QtCore/qmap.h>
 
-#include <QtMediaservices/qmediaservice.h>
-#include <QtMediaservices/qmediaserviceprovider.h>
-#include <QtMediaservices/qmediaserviceproviderplugin.h>
+#include <QtMediaServices/qmediaservice.h>
+#include <QtMediaServices/qmediaserviceprovider.h>
+#include <QtMediaServices/qmediaserviceproviderplugin.h>
 #include "qmediapluginloader_p.h"
-#include <QtMediaservices/qmediaplayer.h>
+#include <QtMediaServices/qmediaplayer.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -337,9 +337,9 @@ public:
                 }
                 break;
             case QMediaServiceProviderHint::ContentType: {
-                    QtMediaservices::SupportEstimate estimate = QtMediaservices::NotSupported;
+                    QtMediaServices::SupportEstimate estimate = QtMediaServices::NotSupported;
                     foreach (QMediaServiceProviderPlugin *currentPlugin, plugins) {
-                        QtMediaservices::SupportEstimate currentEstimate = QtMediaservices::MaybeSupported;
+                        QtMediaServices::SupportEstimate currentEstimate = QtMediaServices::MaybeSupported;
                         QMediaServiceSupportedFormatsInterface *iface =
                                 qobject_cast<QMediaServiceSupportedFormatsInterface*>(currentPlugin);
 
@@ -350,7 +350,7 @@ public:
                             estimate = currentEstimate;
                             plugin = currentPlugin;
 
-                            if (currentEstimate == QtMediaservices::PreferredService)
+                            if (currentEstimate == QtMediaServices::PreferredService)
                                 break;
                         }
                     }
@@ -381,7 +381,7 @@ public:
         }
     }
 
-    QtMediaservices::SupportEstimate hasSupport(const QByteArray &serviceType,
+    QtMediaServices::SupportEstimate hasSupport(const QByteArray &serviceType,
                                      const QString &mimeType,
                                      const QStringList& codecs,
                                      int flags) const
@@ -390,10 +390,10 @@ public:
                 QString::fromLatin1(serviceType.constData(),serviceType.length()));
 
         if (instances.isEmpty())
-            return QtMediaservices::NotSupported;
+            return QtMediaServices::NotSupported;
 
         bool allServicesProvideInterface = true;
-        QtMediaservices::SupportEstimate supportEstimate = QtMediaservices::NotSupported;
+        QtMediaServices::SupportEstimate supportEstimate = QtMediaServices::NotSupported;
 
         foreach(QObject *obj, instances) {
             QMediaServiceSupportedFormatsInterface *iface =
@@ -427,12 +427,12 @@ public:
         }
 
         //don't return PreferredService
-        supportEstimate = qMin(supportEstimate, QtMediaservices::ProbablySupported);
+        supportEstimate = qMin(supportEstimate, QtMediaServices::ProbablySupported);
 
         //Return NotSupported only if no services are available of serviceType
         //or all the services returned NotSupported, otherwise return at least MaybeSupported
         if (!allServicesProvideInterface)
-            supportEstimate = qMax(QtMediaservices::MaybeSupported, supportEstimate);
+            supportEstimate = qMax(QtMediaServices::MaybeSupported, supportEstimate);
 
         return supportEstimate;
     }
@@ -540,13 +540,13 @@ Q_GLOBAL_STATIC(QPluginServiceProvider, pluginProvider);
 */
 
 /*!
-    \fn QtMediaservices::SupportEstimate QMediaServiceProvider::hasSupport(const QByteArray &serviceType, const QString &mimeType, const QStringList& codecs, int flags) const
+    \fn QtMediaServices::SupportEstimate QMediaServiceProvider::hasSupport(const QByteArray &serviceType, const QString &mimeType, const QStringList& codecs, int flags) const
 
     Returns how confident a media service provider is that is can provide a \a serviceType
     service that is able to play media of a specific \a mimeType that is encoded using the listed
     \a codecs while adhearing to constraints identified in \a flags.
 */
-QtMediaservices::SupportEstimate QMediaServiceProvider::hasSupport(const QByteArray &serviceType,
+QtMediaServices::SupportEstimate QMediaServiceProvider::hasSupport(const QByteArray &serviceType,
                                                         const QString &mimeType,
                                                         const QStringList& codecs,
                                                         int flags) const
@@ -556,7 +556,7 @@ QtMediaservices::SupportEstimate QMediaServiceProvider::hasSupport(const QByteAr
     Q_UNUSED(codecs);
     Q_UNUSED(flags);
 
-    return QtMediaservices::MaybeSupported;
+    return QtMediaServices::MaybeSupported;
 }
 
 /*!
diff --git a/src/multimedia/mediaservices/base/qmediaserviceprovider.h b/src/multimedia/mediaservices/base/qmediaserviceprovider.h
index 45021c7..24d2078 100644
--- a/src/multimedia/mediaservices/base/qmediaserviceprovider.h
+++ b/src/multimedia/mediaservices/base/qmediaserviceprovider.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -45,7 +45,7 @@
 #include <QtCore/qobject.h>
 #include <QtCore/qshareddata.h>
 
-#include <QtMediaservices/qtmedianamespace.h>
+#include <QtMediaServices/qtmedianamespace.h>
 
 QT_BEGIN_HEADER
 
@@ -106,7 +106,7 @@ public:
     virtual QMediaService* requestService(const QByteArray &type, const QMediaServiceProviderHint &hint = QMediaServiceProviderHint()) = 0;
     virtual void releaseService(QMediaService *service) = 0;
 
-    virtual QtMediaservices::SupportEstimate hasSupport(const QByteArray &serviceType,
+    virtual QtMediaServices::SupportEstimate hasSupport(const QByteArray &serviceType,
                                              const QString &mimeType,
                                              const QStringList& codecs,
                                              int flags = 0) const;
diff --git a/src/multimedia/mediaservices/base/qmediaserviceproviderplugin.h b/src/multimedia/mediaservices/base/qmediaserviceproviderplugin.h
index bc41845..ab55f84 100644
--- a/src/multimedia/mediaservices/base/qmediaserviceproviderplugin.h
+++ b/src/multimedia/mediaservices/base/qmediaserviceproviderplugin.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -46,7 +46,7 @@
 #include <QtCore/qplugin.h>
 #include <QtCore/qfactoryinterface.h>
 
-#include <QtMediaservices/qmediaserviceprovider.h>
+#include <QtMediaServices/qmediaserviceprovider.h>
 
 #ifdef Q_MOC_RUN
 # pragma Q_MOC_EXPAND_MACROS
@@ -76,7 +76,7 @@ Q_DECLARE_INTERFACE(QMediaServiceProviderFactoryInterface, QMediaServiceProvider
 struct Q_MULTIMEDIA_EXPORT QMediaServiceSupportedFormatsInterface
 {
     virtual ~QMediaServiceSupportedFormatsInterface() {}
-    virtual QtMediaservices::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const = 0;
+    virtual QtMediaServices::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const = 0;
     virtual QStringList supportedMimeTypes() const = 0;
 };
 
diff --git a/src/multimedia/mediaservices/base/qmediatimerange.cpp b/src/multimedia/mediaservices/base/qmediatimerange.cpp
index 74f54dd..2dba20c 100644
--- a/src/multimedia/mediaservices/base/qmediatimerange.cpp
+++ b/src/multimedia/mediaservices/base/qmediatimerange.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtMediaservices/qmediatimerange.h>
+#include <QtMediaServices/qmediatimerange.h>
 
 
 QT_BEGIN_NAMESPACE
diff --git a/src/multimedia/mediaservices/base/qmediatimerange.h b/src/multimedia/mediaservices/base/qmediatimerange.h
index 94beaad..33b2f27 100644
--- a/src/multimedia/mediaservices/base/qmediatimerange.h
+++ b/src/multimedia/mediaservices/base/qmediatimerange.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -43,7 +43,7 @@
 #define QMEDIATIMERANGE_H
 
 #include <QtCore/qshareddata.h>
-#include <QtMediaservices/qtmedianamespace.h>
+#include <QtMediaServices/qtmedianamespace.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/multimedia/mediaservices/base/qmetadatacontrol.cpp b/src/multimedia/mediaservices/base/qmetadatacontrol.cpp
index 32be987..8bfec7e 100644
--- a/src/multimedia/mediaservices/base/qmetadatacontrol.cpp
+++ b/src/multimedia/mediaservices/base/qmetadatacontrol.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtMediaservices/qmetadatacontrol.h>
+#include <QtMediaServices/qmetadatacontrol.h>
 #include "qmediacontrol_p.h"
 
 
@@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
     its current media it will implement QMetaDataControl.  This control
     provides functions for both retrieving and setting meta-data values.
     Meta-data may be addressed by the well defined keys in the
-    QtMediaservices::MetaData enumeration using the metaData() functions, or by
+    QtMediaServices::MetaData enumeration using the metaData() functions, or by
     string keys using the extendedMetaData() functions.
 
     The functionality provided by this control is exposed to application
@@ -117,13 +117,13 @@ QMetaDataControl::~QMetaDataControl()
 */
 
 /*!
-    \fn QVariant QMetaDataControl::metaData(QtMediaservices::MetaData key) const
+    \fn QVariant QMetaDataControl::metaData(QtMediaServices::MetaData key) const
 
     Returns the meta-data for the given \a key.
 */
 
 /*!
-    \fn void QMetaDataControl::setMetaData(QtMediaservices::MetaData key, const QVariant &value)
+    \fn void QMetaDataControl::setMetaData(QtMediaServices::MetaData key, const QVariant &value)
 
     Sets the \a value of the meta-data element with the given \a key.
 */
diff --git a/src/multimedia/mediaservices/base/qmetadatacontrol.h b/src/multimedia/mediaservices/base/qmetadatacontrol.h
index cf4a0d3..e91c88b 100644
--- a/src/multimedia/mediaservices/base/qmetadatacontrol.h
+++ b/src/multimedia/mediaservices/base/qmetadatacontrol.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -42,9 +42,9 @@
 #ifndef QMETADATACONTROL_H
 #define QMETADATACONTROL_H
 
-#include <QtMediaservices/qmediacontrol.h>
-#include <QtMediaservices/qmediaobject.h>
-#include <QtMediaservices/qmediaresource.h>
+#include <QtMediaServices/qmediacontrol.h>
+#include <QtMediaServices/qmediaobject.h>
+#include <QtMediaServices/qmediaresource.h>
 
 
 QT_BEGIN_HEADER
@@ -63,9 +63,9 @@ public:
     virtual bool isWritable() const = 0;
     virtual bool isMetaDataAvailable() const = 0;
 
-    virtual QVariant metaData(QtMediaservices::MetaData key) const = 0;
-    virtual void setMetaData(QtMediaservices::MetaData key, const QVariant &value) = 0;
-    virtual QList<QtMediaservices::MetaData> availableMetaData() const = 0;
+    virtual QVariant metaData(QtMediaServices::MetaData key) const = 0;
+    virtual void setMetaData(QtMediaServices::MetaData key, const QVariant &value) = 0;
+    virtual QList<QtMediaServices::MetaData> availableMetaData() const = 0;
 
     virtual QVariant extendedMetaData(const QString &key) const = 0;
     virtual void setExtendedMetaData(const QString &key, const QVariant &value) = 0;
diff --git a/src/multimedia/mediaservices/base/qpaintervideosurface.cpp b/src/multimedia/mediaservices/base/qpaintervideosurface.cpp
index b3e0dd5..302e772 100644
--- a/src/multimedia/mediaservices/base/qpaintervideosurface.cpp
+++ b/src/multimedia/mediaservices/base/qpaintervideosurface.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/src/multimedia/mediaservices/base/qpaintervideosurface_mac_p.h b/src/multimedia/mediaservices/base/qpaintervideosurface_mac_p.h
index 13c22c2..4f8a7a6 100644
--- a/src/multimedia/mediaservices/base/qpaintervideosurface_mac_p.h
+++ b/src/multimedia/mediaservices/base/qpaintervideosurface_mac_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/src/multimedia/mediaservices/base/qpaintervideosurface_p.h b/src/multimedia/mediaservices/base/qpaintervideosurface_p.h
index de9c24a..20628c4 100644
--- a/src/multimedia/mediaservices/base/qpaintervideosurface_p.h
+++ b/src/multimedia/mediaservices/base/qpaintervideosurface_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/src/multimedia/mediaservices/base/qtmedianamespace.h b/src/multimedia/mediaservices/base/qtmedianamespace.h
index 7db7aa8..917c646 100644
--- a/src/multimedia/mediaservices/base/qtmedianamespace.h
+++ b/src/multimedia/mediaservices/base/qtmedianamespace.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Multimedia)
 
-namespace QtMediaservices
+namespace QtMediaServices
 {
     enum MetaData
     {
diff --git a/src/multimedia/mediaservices/base/qvideodevicecontrol.cpp b/src/multimedia/mediaservices/base/qvideodevicecontrol.cpp
index 128cee9..30c56cf 100644
--- a/src/multimedia/mediaservices/base/qvideodevicecontrol.cpp
+++ b/src/multimedia/mediaservices/base/qvideodevicecontrol.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtMediaservices/qvideodevicecontrol.h>
+#include <QtMediaServices/qvideodevicecontrol.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/multimedia/mediaservices/base/qvideodevicecontrol.h b/src/multimedia/mediaservices/base/qvideodevicecontrol.h
index df1d4fa..b86a35c 100644
--- a/src/multimedia/mediaservices/base/qvideodevicecontrol.h
+++ b/src/multimedia/mediaservices/base/qvideodevicecontrol.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -42,7 +42,7 @@
 #ifndef QVIDEODEVICECONTROL_H
 #define QVIDEODEVICECONTROL_H
 
-#include <QtMediaservices/qmediacontrol.h>
+#include <QtMediaServices/qmediacontrol.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/multimedia/mediaservices/base/qvideooutputcontrol.cpp b/src/multimedia/mediaservices/base/qvideooutputcontrol.cpp
index 7d7ed4b..532c892 100644
--- a/src/multimedia/mediaservices/base/qvideooutputcontrol.cpp
+++ b/src/multimedia/mediaservices/base/qvideooutputcontrol.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtMediaservices/qvideooutputcontrol.h>
+#include <QtMediaServices/qvideooutputcontrol.h>
 
 
 QT_BEGIN_NAMESPACE
diff --git a/src/multimedia/mediaservices/base/qvideooutputcontrol.h b/src/multimedia/mediaservices/base/qvideooutputcontrol.h
index 05bc164..ad69911 100644
--- a/src/multimedia/mediaservices/base/qvideooutputcontrol.h
+++ b/src/multimedia/mediaservices/base/qvideooutputcontrol.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -42,7 +42,7 @@
 #ifndef QVIDEOOUTPUTCONTROL_H
 #define QVIDEOOUTPUTCONTROL_H
 
-#include <QtMediaservices/qmediacontrol.h>
+#include <QtMediaServices/qmediacontrol.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/multimedia/mediaservices/base/qvideorenderercontrol.cpp b/src/multimedia/mediaservices/base/qvideorenderercontrol.cpp
index bd7c78d..6cc3138 100644
--- a/src/multimedia/mediaservices/base/qvideorenderercontrol.cpp
+++ b/src/multimedia/mediaservices/base/qvideorenderercontrol.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtMediaservices/qvideorenderercontrol.h>
+#include <QtMediaServices/qvideorenderercontrol.h>
 
 #include "qmediacontrol_p.h"
 
diff --git a/src/multimedia/mediaservices/base/qvideorenderercontrol.h b/src/multimedia/mediaservices/base/qvideorenderercontrol.h
index fd130ac..29a66ea 100644
--- a/src/multimedia/mediaservices/base/qvideorenderercontrol.h
+++ b/src/multimedia/mediaservices/base/qvideorenderercontrol.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -42,7 +42,7 @@
 #ifndef QVIDEORENDERERCONTROL_H
 #define QVIDEORENDERERCONTROL_H
 
-#include <QtMediaservices/qmediacontrol.h>
+#include <QtMediaServices/qmediacontrol.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/mediaservices/base/qvideowidget.cpp b/src/multimedia/mediaservices/base/qvideowidget.cpp
index 52291b0..d39b1f4 100644
--- a/src/multimedia/mediaservices/base/qvideowidget.cpp
+++ b/src/multimedia/mediaservices/base/qvideowidget.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -41,14 +41,14 @@
 
 #include "qvideowidget_p.h"
 
-#include <QtMediaservices/qmediaobject.h>
-#include <QtMediaservices/qmediaservice.h>
-#include <QtMediaservices/qvideooutputcontrol.h>
-#include <QtMediaservices/qvideowindowcontrol.h>
-#include <QtMediaservices/qvideowidgetcontrol.h>
+#include <QtMediaServices/qmediaobject.h>
+#include <QtMediaServices/qmediaservice.h>
+#include <QtMediaServices/qvideooutputcontrol.h>
+#include <QtMediaServices/qvideowindowcontrol.h>
+#include <QtMediaServices/qvideowidgetcontrol.h>
 
 #include "qpaintervideosurface_p.h"
-#include <QtMediaservices/qvideorenderercontrol.h>
+#include <QtMediaServices/qvideorenderercontrol.h>
 #include <QtMultimedia/qvideosurfaceformat.h>
 #include <qpainter.h>
 
diff --git a/src/multimedia/mediaservices/base/qvideowidget.h b/src/multimedia/mediaservices/base/qvideowidget.h
index 080e19c..8033d40 100644
--- a/src/multimedia/mediaservices/base/qvideowidget.h
+++ b/src/multimedia/mediaservices/base/qvideowidget.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/src/multimedia/mediaservices/base/qvideowidget_p.h b/src/multimedia/mediaservices/base/qvideowidget_p.h
index 4f67117..bb44dfa 100644
--- a/src/multimedia/mediaservices/base/qvideowidget_p.h
+++ b/src/multimedia/mediaservices/base/qvideowidget_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include <QtMediaservices/qvideowidget.h>
+#include <QtMediaServices/qvideowidget.h>
 
 #ifndef QT_NO_OPENGL
 #include <QGLWidget>
diff --git a/src/multimedia/mediaservices/base/qvideowidgetcontrol.cpp b/src/multimedia/mediaservices/base/qvideowidgetcontrol.cpp
index 1cc7eaf..538f158 100644
--- a/src/multimedia/mediaservices/base/qvideowidgetcontrol.cpp
+++ b/src/multimedia/mediaservices/base/qvideowidgetcontrol.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtMediaservices/qvideowidgetcontrol.h>
+#include <QtMediaServices/qvideowidgetcontrol.h>
 #include "qmediacontrol_p.h"
 
 
diff --git a/src/multimedia/mediaservices/base/qvideowidgetcontrol.h b/src/multimedia/mediaservices/base/qvideowidgetcontrol.h
index a8105ac..1fe43cc 100644
--- a/src/multimedia/mediaservices/base/qvideowidgetcontrol.h
+++ b/src/multimedia/mediaservices/base/qvideowidgetcontrol.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -44,8 +44,8 @@
 
 #include <QtGui/qwidget.h>
 
-#include <QtMediaservices/qvideowidget.h>
-#include <QtMediaservices/qmediacontrol.h>
+#include <QtMediaServices/qvideowidget.h>
+#include <QtMediaServices/qmediacontrol.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/multimedia/mediaservices/base/qvideowindowcontrol.cpp b/src/multimedia/mediaservices/base/qvideowindowcontrol.cpp
index f73b187..967a2d6 100644
--- a/src/multimedia/mediaservices/base/qvideowindowcontrol.cpp
+++ b/src/multimedia/mediaservices/base/qvideowindowcontrol.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtMediaservices/qvideowindowcontrol.h>
+#include <QtMediaServices/qvideowindowcontrol.h>
 
 
 QT_BEGIN_NAMESPACE
diff --git a/src/multimedia/mediaservices/base/qvideowindowcontrol.h b/src/multimedia/mediaservices/base/qvideowindowcontrol.h
index 0fabce9..74c1786 100644
--- a/src/multimedia/mediaservices/base/qvideowindowcontrol.h
+++ b/src/multimedia/mediaservices/base/qvideowindowcontrol.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMediaservices module of the Qt Toolkit.
+** This file is part of the QtMediaServices module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -44,8 +44,8 @@
 
 #include <QtGui/qwidget.h>
 
-#include <QtMediaservices/qmediacontrol.h>
-#include <QtMediaservices/qvideowidget.h>
+#include <QtMediaServices/qmediacontrol.h>
+#include <QtMediaServices/qvideowidget.h>
 
 QT_BEGIN_HEADER