Clean up the file and class names for the mock backend

Change-Id: I3750bdb99503a425757f149963370ae4100a011b
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: André de la Rocha <andre.rocha@qt.io>

24 files changed, 111 insertions, 110 deletions

diff --git a/src/imports/multimedia/qmldir b/src/imports/multimedia/qmldir
index 028587088..387cb3c14 100644
--- a/src/imports/multimedia/qmldir
+++ b/src/imports/multimedia/qmldir
@@ -4,3 +4,4 @@ classname QMultimediaDeclarativeModule
 typeinfo plugins.qmltypes
 prefer :/qt-project.org/imports/QtMultimedia/
 Video 5.0 Video.qml
+
diff --git a/tests/auto/unit/mockbackend/CMakeLists.txt b/tests/auto/unit/mockbackend/CMakeLists.txt
index 514d371de..12c93fc33 100644
--- a/tests/auto/unit/mockbackend/CMakeLists.txt
+++ b/tests/auto/unit/mockbackend/CMakeLists.txt
@@ -13,15 +13,15 @@ target_link_libraries(QtMultimediaMockBackend INTERFACE
     Qt::MultimediaPrivate
 )
 target_sources(QtMultimediaMockBackend INTERFACE
-    mockaudiodecodercontrol.h
-    mockcameracontrol.h
-    mockcameraexposurecontrol.h
-    mockcamerafocuscontrol.h
-    mockcameraimagecapturecontrol.h
-    mockcameraimageprocessingcontrol.h
-    mockmediaplayer.h
-    mockmediarecordercontrol.h
-    mockmediarecorderservice.h
+    qmockaudiodecoder.h
+    qmockcamera.h
+    qmockcameraexposure.h
+    qmockcamerafocus.h
+    qmockcameraimageprocessing.h
+    qmockimagecapture.h
+    qmockmediaplayer.h
+    qmockmediaencoder.h
+    qmockmediacapturesession.h
     qmockdevicemanager.cpp
     qmockdevicemanager_p.h
     qmockintegration.cpp
diff --git a/tests/auto/unit/mockbackend/audio.pri b/tests/auto/unit/mockbackend/audio.pri
index 49105a062..72d0c8204 100644
--- a/tests/auto/unit/mockbackend/audio.pri
+++ b/tests/auto/unit/mockbackend/audio.pri
@@ -1,3 +1,3 @@
 INCLUDEPATH += $$PWD
 HEADERS *= \
-    $$PWD/mockaudiodecodercontrol.h
+    $$PWD/mockaudiodecoder.h
diff --git a/tests/auto/unit/mockbackend/capture.pri b/tests/auto/unit/mockbackend/capture.pri
index f9ee0280f..004388c07 100644
--- a/tests/auto/unit/mockbackend/capture.pri
+++ b/tests/auto/unit/mockbackend/capture.pri
@@ -1,9 +1,9 @@
 HEADERS *= \
-    $$PWD/mockcameracontrol.h \
-    $$PWD/mockcameraexposurecontrol.h \
-    $$PWD/mockcamerafocuscontrol.h \
-    $$PWD/mockcameraimagecapturecontrol.h \
-    $$PWD/mockcameraimageprocessingcontrol.h \
-    $$PWD/mockmediarecordercontrol.h \
+    $$PWD/mockcamera.h \
+    $$PWD/mockcameraexposure.h \
+    $$PWD/mockcamerafocus.h \
+    $$PWD/mockcameraimagecapture.h \
+    $$PWD/mockcameraimageprocessing.h \
+    $$PWD/mockmediarecorder.h \
     $$PWD/mockmediarecorderservice.h \
-    $$PWD/mockvideodeviceselectorcontrol.h \
+    $$PWD/mockvideodeviceselector.h \
diff --git a/tests/auto/unit/mockbackend/player.pri b/tests/auto/unit/mockbackend/player.pri
index 7730fd7ce..e70da9a80 100644
--- a/tests/auto/unit/mockbackend/player.pri
+++ b/tests/auto/unit/mockbackend/player.pri
@@ -1,5 +1,5 @@
 INCLUDEPATH += $$PWD
 HEADERS += \
-    $$PWD/mockmediaplayercontrol.h \
+    $$PWD/mockmediaplayer.h \
     $$PWD/mockmediaplayerservice.h \
     
diff --git a/tests/auto/unit/mockbackend/mockaudiodecodercontrol.h b/tests/auto/unit/mockbackend/qmockaudiodecoder.h
index 648a50e94..78d131fe1 100644
--- a/tests/auto/unit/mockbackend/mockaudiodecodercontrol.h
+++ b/tests/auto/unit/mockbackend/qmockaudiodecoder.h
@@ -41,12 +41,12 @@
 
 QT_BEGIN_NAMESPACE
 
-class MockAudioDecoderControl : public QPlatformAudioDecoder
+class QMockAudioDecoder : public QPlatformAudioDecoder
 {
     Q_OBJECT
 
 public:
-    MockAudioDecoderControl(QObject *parent = 0)
+    QMockAudioDecoder(QObject *parent = 0)
         : QPlatformAudioDecoder(parent)
         , mState(QAudioDecoder::StoppedState)
         , mDevice(0)
diff --git a/tests/auto/unit/mockbackend/mockcameracontrol.h b/tests/auto/unit/mockbackend/qmockcamera.h
index 58cc7ec57..da8352630 100644
--- a/tests/auto/unit/mockbackend/mockcameracontrol.h
+++ b/tests/auto/unit/mockbackend/qmockcamera.h
@@ -31,27 +31,27 @@
 
 #include "private/qplatformcamera_p.h"
 #include "qcamerainfo.h"
-#include "mockcamerafocuscontrol.h"
-#include "mockcameraimageprocessingcontrol.h"
-#include "mockcameraexposurecontrol.h"
+#include "qmockcamerafocus.h"
+#include "qmockcameraimageprocessing.h"
+#include "qmockcameraexposure.h"
 #include <qtimer.h>
 
-class MockCameraControl : public QPlatformCamera
+class QMockCamera : public QPlatformCamera
 {
     friend class MockCaptureControl;
     Q_OBJECT
 public:
-    MockCameraControl(QCamera *parent = 0):
+    QMockCamera(QCamera *parent = 0):
             QPlatformCamera(parent),
             m_status(QCamera::InactiveStatus),
             m_propertyChangesSupported(false)
     {
-        mockExposureControl = new MockCameraExposureControl(this);
-        mockFocusControl = new MockCameraFocusControl(this);
-        mockImageProcessingControl = new MockImageProcessingControl(this);
+        mockExposureControl = new QMockCameraExposure(this);
+        mockFocusControl = new QMockCameraFocus(this);
+        mockImageProcessingControl = new QMockCameraImageProcessing(this);
     }
 
-    ~MockCameraControl() {}
+    ~QMockCamera() {}
 
     void start() { setActive(true); }
     void stop() { setActive(false); }
@@ -88,9 +88,9 @@ public:
     QCameraInfo m_camera;
     bool m_propertyChangesSupported;
 
-    MockCameraExposureControl *mockExposureControl;
-    MockCameraFocusControl *mockFocusControl;
-    MockImageProcessingControl *mockImageProcessingControl;
+    QMockCameraExposure *mockExposureControl;
+    QMockCameraFocus *mockFocusControl;
+    QMockCameraImageProcessing *mockImageProcessingControl;
 };
 
 
diff --git a/tests/auto/unit/mockbackend/mockcameraexposurecontrol.h b/tests/auto/unit/mockbackend/qmockcameraexposure.h
index 8fd9e2026..76f24cdd8 100644
--- a/tests/auto/unit/mockbackend/mockcameraexposurecontrol.h
+++ b/tests/auto/unit/mockbackend/qmockcameraexposure.h
@@ -31,11 +31,11 @@
 
 #include "private/qplatformcameraexposure_p.h"
 
-class MockCameraExposureControl : public QPlatformCameraExposure
+class QMockCameraExposure : public QPlatformCameraExposure
 {
     Q_OBJECT
 public:
-    MockCameraExposureControl(QObject *parent = 0):
+    QMockCameraExposure(QObject *parent = 0):
         QPlatformCameraExposure(parent),
         m_aperture(2.8),
         m_shutterSpeed(0.01),
@@ -63,7 +63,7 @@ public:
             m_exposureModes << QVariant::fromValue<QCameraExposure::ExposureMode>(mode);
     }
 
-    ~MockCameraExposureControl() {}
+    ~QMockCameraExposure() {}
 
     bool isParameterSupported(ExposureParameter parameter) const
     {
diff --git a/tests/auto/unit/mockbackend/mockcamerafocuscontrol.h b/tests/auto/unit/mockbackend/qmockcamerafocus.h
index 9442fb890..9d0d81d3a 100644
--- a/tests/auto/unit/mockbackend/mockcamerafocuscontrol.h
+++ b/tests/auto/unit/mockbackend/qmockcamerafocus.h
@@ -32,18 +32,18 @@
 #include "private/qplatformcamerafocus_p.h"
 #include "qcamerafocus.h"
 
-class MockCameraFocusControl : public QPlatformCameraFocus
+class QMockCameraFocus : public QPlatformCameraFocus
 {
     Q_OBJECT
 public:
-    MockCameraFocusControl(QObject *parent = 0):
+    QMockCameraFocus(QObject *parent = 0):
         QPlatformCameraFocus(parent),
         m_focusMode(QCameraFocus::AutoFocus),
         m_focusPoint(0.5, 0.5)
     {
     }
 
-    ~MockCameraFocusControl() {}
+    ~QMockCameraFocus() {}
 
     QCameraFocus::FocusMode focusMode() const
     {
diff --git a/tests/auto/unit/mockbackend/mockcameraimageprocessingcontrol.h b/tests/auto/unit/mockbackend/qmockcameraimageprocessing.h
index 1a2ee3bad..5f5ccce3e 100644
--- a/tests/auto/unit/mockbackend/mockcameraimageprocessingcontrol.h
+++ b/tests/auto/unit/mockbackend/qmockcameraimageprocessing.h
@@ -31,11 +31,11 @@
 
 #include "private/qplatformcameraimageprocessing_p.h"
 
-class MockImageProcessingControl : public QPlatformCameraImageProcessing
+class QMockCameraImageProcessing : public QPlatformCameraImageProcessing
 {
     Q_OBJECT
 public:
-    MockImageProcessingControl(QObject *parent = 0)
+    QMockCameraImageProcessing(QObject *parent = 0)
         : QPlatformCameraImageProcessing(parent)
     {
         m_supportedWhiteBalance.insert(QCameraImageProcessing::WhiteBalanceAuto);
diff --git a/tests/auto/unit/mockbackend/mockcameraimagecapturecontrol.h b/tests/auto/unit/mockbackend/qmockimagecapture.h
index 70d8fa920..0ff78efc7 100644
--- a/tests/auto/unit/mockbackend/mockcameraimagecapturecontrol.h
+++ b/tests/auto/unit/mockbackend/qmockimagecapture.h
@@ -35,18 +35,18 @@
 
 #include "private/qplatformcameraimagecapture_p.h"
 #include "private/qplatformcamera_p.h"
-#include "mockcameracontrol.h"
+#include "qmockcamera.h"
 
-class MockCaptureControl : public QPlatformCameraImageCapture
+class QMockImageCapture : public QPlatformCameraImageCapture
 {
     Q_OBJECT
 public:
-    MockCaptureControl(MockCameraControl *cameraControl, QObject *parent = 0)
+    QMockImageCapture(QMockCamera *cameraControl, QObject *parent = 0)
         : QPlatformCameraImageCapture(parent), m_cameraControl(cameraControl), m_captureRequest(0), m_ready(true)
     {
     }
 
-    ~MockCaptureControl()
+    ~QMockImageCapture()
     {
     }
 
@@ -93,7 +93,7 @@ private Q_SLOTS:
     }
 
 private:
-    MockCameraControl *m_cameraControl;
+    QMockCamera *m_cameraControl;
     QString m_fileName;
     int m_captureRequest;
     bool m_ready;
diff --git a/tests/auto/unit/mockbackend/qmockintegration.cpp b/tests/auto/unit/mockbackend/qmockintegration.cpp
index df8bd8ebe..d716c9934 100644
--- a/tests/auto/unit/mockbackend/qmockintegration.cpp
+++ b/tests/auto/unit/mockbackend/qmockintegration.cpp
@@ -39,10 +39,10 @@
 
 #include "qmockintegration_p.h"
 #include "qmockdevicemanager_p.h"
-#include "mockmediaplayer.h"
-#include "mockaudiodecodercontrol.h"
-#include "mockcameracontrol.h"
-#include "mockmediarecorderservice.h"
+#include "qmockmediaplayer.h"
+#include "qmockaudiodecoder.h"
+#include "qmockcamera.h"
+#include "qmockmediacapturesession.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -69,7 +69,7 @@ QPlatformAudioDecoder *QMockIntegration::createAudioDecoder()
     if (m_flags & NoAudioDecoderInterface)
         m_lastAudioDecoderControl = nullptr;
     else
-        m_lastAudioDecoderControl = new MockAudioDecoderControl;
+        m_lastAudioDecoderControl = new QMockAudioDecoder;
     return m_lastAudioDecoderControl;
 }
 
@@ -78,7 +78,7 @@ QPlatformMediaPlayer *QMockIntegration::createPlayer(QMediaPlayer *parent)
     if (m_flags & NoPlayerInterface)
         m_lastPlayer = nullptr;
     else
-        m_lastPlayer = new MockMediaPlayer(parent);
+        m_lastPlayer = new QMockMediaPlayer(parent);
     return m_lastPlayer;
 }
 
@@ -87,7 +87,7 @@ QPlatformCamera *QMockIntegration::createCamera(QCamera *parent)
     if (m_flags & NoCaptureInterface)
         m_lastCamera = nullptr;
     else
-        m_lastCamera = new MockCameraControl(parent);
+        m_lastCamera = new QMockCamera(parent);
     return m_lastCamera;
 }
 
@@ -97,10 +97,10 @@ QPlatformMediaCaptureSession *QMockIntegration::createCaptureSession(QMediaRecor
     if (m_flags & NoCaptureInterface)
         m_lastCaptureService = nullptr;
     else
-        m_lastCaptureService = new MockMediaRecorderService();
+        m_lastCaptureService = new QMockMediaCaptureSession();
     return m_lastCaptureService;
 }
 
-bool MockMediaRecorderService::simpleCamera = false;
+bool QMockMediaCaptureSession::simpleCamera = false;
 
 QT_END_NAMESPACE
diff --git a/tests/auto/unit/mockbackend/qmockintegration_p.h b/tests/auto/unit/mockbackend/qmockintegration_p.h
index aa9055e86..eb34a5da2 100644
--- a/tests/auto/unit/mockbackend/qmockintegration_p.h
+++ b/tests/auto/unit/mockbackend/qmockintegration_p.h
@@ -56,10 +56,10 @@
 QT_BEGIN_NAMESPACE
 
 class QMockDeviceManager;
-class MockMediaPlayer;
-class MockAudioDecoderControl;
-class MockCameraControl;
-class MockMediaRecorderService;
+class QMockMediaPlayer;
+class QMockAudioDecoder;
+class QMockCamera;
+class QMockMediaCaptureSession;
 
 class QMockIntegration : public QPlatformMediaIntegration
 {
@@ -87,18 +87,18 @@ public:
     void setFlags(Flags f) { m_flags = f; }
     Flags flags() const { return m_flags; }
 
-    MockMediaPlayer *lastPlayer() const { return m_lastPlayer; }
-    MockAudioDecoderControl *lastAudioDecoder() const { return m_lastAudioDecoderControl; }
-    MockCameraControl *lastCamera() const { return m_lastCamera; }
-    MockMediaRecorderService *lastCaptureService() const { return m_lastCaptureService; }
+    QMockMediaPlayer *lastPlayer() const { return m_lastPlayer; }
+    QMockAudioDecoder *lastAudioDecoder() const { return m_lastAudioDecoderControl; }
+    QMockCamera *lastCamera() const { return m_lastCamera; }
+    QMockMediaCaptureSession *lastCaptureService() const { return m_lastCaptureService; }
 
 private:
     Flags m_flags = {};
     QMockDeviceManager *m_manager = nullptr;
-    MockMediaPlayer *m_lastPlayer = nullptr;
-    MockAudioDecoderControl *m_lastAudioDecoderControl = nullptr;
-    MockCameraControl *m_lastCamera = nullptr;
-    MockMediaRecorderService *m_lastCaptureService = nullptr;
+    QMockMediaPlayer *m_lastPlayer = nullptr;
+    QMockAudioDecoder *m_lastAudioDecoderControl = nullptr;
+    QMockCamera *m_lastCamera = nullptr;
+    QMockMediaCaptureSession *m_lastCaptureService = nullptr;
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QMockIntegration::Flags);
diff --git a/tests/auto/unit/mockbackend/mockmediarecorderservice.h b/tests/auto/unit/mockbackend/qmockmediacapturesession.h
index cbea0c35b..4d829b534 100644
--- a/tests/auto/unit/mockbackend/mockmediarecorderservice.h
+++ b/tests/auto/unit/mockbackend/qmockmediacapturesession.h
@@ -29,21 +29,21 @@
 #ifndef MOCKSERVICE_H
 #define MOCKSERVICE_H
 
-#include "mockmediarecordercontrol.h"
-#include "mockcameraimagecapturecontrol.h"
-#include "mockcameracontrol.h"
+#include "qmockmediaencoder.h"
+#include "qmockimagecapture.h"
+#include "qmockcamera.h"
 #include <private/qplatformmediacapture_p.h>
 
-class MockMediaRecorderService : public QPlatformMediaCaptureSession
+class QMockMediaCaptureSession : public QPlatformMediaCaptureSession
 {
     Q_OBJECT
 public:
-    MockMediaRecorderService()
+    QMockMediaCaptureSession()
         : hasControls(true)
     {
-        mockControl = new MockMediaEncoderControl(this);
+        mockControl = new QMockMediaEncoder(this);
     }
-    ~MockMediaRecorderService()
+    ~QMockMediaCaptureSession()
     {
     }
 
@@ -51,7 +51,7 @@ public:
 
     void setCamera(QPlatformCamera *camera) override
     {
-        MockCameraControl *control = static_cast<MockCameraControl *>(camera);
+        QMockCamera *control = static_cast<QMockCamera *>(camera);
         if (mockCameraControl == control)
             return;
 
@@ -97,9 +97,9 @@ public:
 
     static bool simpleCamera;
 
-    MockCameraControl *mockCameraControl = nullptr;
-    MockCaptureControl *mockCaptureControl = nullptr;
-    MockMediaEncoderControl *mockControl = nullptr;
+    QMockCamera *mockCameraControl = nullptr;
+    QMockImageCapture *mockCaptureControl = nullptr;
+    QMockMediaEncoder *mockControl = nullptr;
 
     QAudioDeviceInfo m_audioInput;
     bool m_muted = false;
diff --git a/tests/auto/unit/mockbackend/mockmediarecordercontrol.h b/tests/auto/unit/mockbackend/qmockmediaencoder.h
index 58478bd26..4a9214616 100644
--- a/tests/auto/unit/mockbackend/mockmediarecordercontrol.h
+++ b/tests/auto/unit/mockbackend/qmockmediaencoder.h
@@ -34,12 +34,12 @@
 
 #include "private/qplatformmediaencoder_p.h"
 
-class MockMediaEncoderControl : public QPlatformMediaEncoder
+class QMockMediaEncoder : public QPlatformMediaEncoder
 {
     Q_OBJECT
 
 public:
-    MockMediaEncoderControl(QObject *parent = 0):
+    QMockMediaEncoder(QObject *parent = 0):
         QPlatformMediaEncoder(parent),
         m_state(QMediaEncoder::StoppedState),
         m_status(QMediaEncoder::StoppedStatus),
diff --git a/tests/auto/unit/mockbackend/mockmediaplayer.h b/tests/auto/unit/mockbackend/qmockmediaplayer.h
index 0ef695e40..268bcc154 100644
--- a/tests/auto/unit/mockbackend/mockmediaplayer.h
+++ b/tests/auto/unit/mockbackend/qmockmediaplayer.h
@@ -32,12 +32,12 @@
 #include "private/qplatformmediaplayer_p.h"
 #include <qurl.h>
 
-class MockMediaPlayer : public QPlatformMediaPlayer
+class QMockMediaPlayer : public QPlatformMediaPlayer
 {
-    friend class MockMediaPlayerService;
+    friend class QMockMediaPlayerService;
 
 public:
-    MockMediaPlayer(QMediaPlayer *parent)
+    QMockMediaPlayer(QMediaPlayer *parent)
         : QPlatformMediaPlayer(parent)
         , _state(QMediaPlayer::StoppedState)
         , _mediaStatus(QMediaPlayer::NoMedia)
@@ -55,7 +55,7 @@ public:
         , _isValid(false)
     {
     }
-    ~MockMediaPlayer()
+    ~QMockMediaPlayer()
     {
     }
 
diff --git a/tests/auto/unit/multimedia/qaudiodecoder/tst_qaudiodecoder.cpp b/tests/auto/unit/multimedia/qaudiodecoder/tst_qaudiodecoder.cpp
index daac608e5..baf6adcbf 100644
--- a/tests/auto/unit/multimedia/qaudiodecoder/tst_qaudiodecoder.cpp
+++ b/tests/auto/unit/multimedia/qaudiodecoder/tst_qaudiodecoder.cpp
@@ -31,7 +31,7 @@
 #include <QtTest/QtTest>
 
 #include "qaudiodecoder.h"
-#include "mockaudiodecodercontrol.h"
+#include "qmockaudiodecoder.h"
 #include "qmockintegration_p.h"
 
 class tst_QAudioDecoder : public QObject
diff --git a/tests/auto/unit/multimedia/qaudiorecorder/tst_qaudiorecorder.cpp b/tests/auto/unit/multimedia/qaudiorecorder/tst_qaudiorecorder.cpp
index 4be4733cf..8a0d2bb1b 100644
--- a/tests/auto/unit/multimedia/qaudiorecorder/tst_qaudiorecorder.cpp
+++ b/tests/auto/unit/multimedia/qaudiorecorder/tst_qaudiorecorder.cpp
@@ -39,7 +39,7 @@
 
 //TESTED_COMPONENT=src/multimedia
 
-#include "mockmediarecorderservice.h"
+#include "qmockmediacapturesession.h"
 #include "qmockintegration_p.h"
 
 QT_USE_NAMESPACE
diff --git a/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp b/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp
index 09e0a05ad..4e54abff2 100644
--- a/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp
+++ b/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp
@@ -45,7 +45,7 @@
 #include <qmediadevicemanager.h>
 
 #include "qmockintegration_p.h"
-#include "mockmediarecorderservice.h"
+#include "qmockmediacapturesession.h"
 
 QT_USE_NAMESPACE
 
@@ -123,7 +123,7 @@ private:
 
 void tst_QCamera::initTestCase()
 {
-    MockMediaRecorderService::simpleCamera = false;
+    QMockMediaCaptureSession::simpleCamera = false;
 }
 
 void tst_QCamera::init()
@@ -138,7 +138,7 @@ void tst_QCamera::cleanup()
 
 void tst_QCamera::testSimpleCamera()
 {
-    MockMediaRecorderService::simpleCamera = true;
+    QMockMediaCaptureSession::simpleCamera = true;
     QCamera camera;
 
     QCOMPARE(camera.isActive(), false);
@@ -150,7 +150,7 @@ void tst_QCamera::testSimpleCamera()
 
 void tst_QCamera::testSimpleCameraWhiteBalance()
 {
-    MockMediaRecorderService::simpleCamera = true;
+    QMockMediaCaptureSession::simpleCamera = true;
     QCamera camera;
 
     //only WhiteBalanceAuto is supported
@@ -166,7 +166,7 @@ void tst_QCamera::testSimpleCameraWhiteBalance()
 
 void tst_QCamera::testSimpleCameraExposure()
 {
-    MockMediaRecorderService::simpleCamera = true;
+    QMockMediaCaptureSession::simpleCamera = true;
 
     QCamera camera;
     QCameraExposure *cameraExposure = camera.exposure();
@@ -211,7 +211,7 @@ void tst_QCamera::testSimpleCameraExposure()
 
 void tst_QCamera::testSimpleCameraFocus()
 {
-    MockMediaRecorderService::simpleCamera = true;
+    QMockMediaCaptureSession::simpleCamera = true;
 
     QCamera camera;
 
@@ -242,7 +242,7 @@ void tst_QCamera::testSimpleCameraFocus()
 
 void tst_QCamera::testSimpleCameraCapture()
 {
-    MockMediaRecorderService::simpleCamera = true;
+    QMockMediaCaptureSession::simpleCamera = true;
 
     QMediaCaptureSession session;
     QCamera camera;
@@ -329,7 +329,7 @@ void tst_QCamera::testCameraWhiteBalance()
     whiteBalanceModes << QCameraImageProcessing::WhiteBalanceTungsten;
 
     QCamera camera;
-    MockCameraControl *mockCameraControl = new MockCameraControl(&camera);
+    QMockCamera *mockCameraControl = new QMockCamera(&camera);
     //auto *service = integration->lastCaptureService();
     mockCameraControl->mockImageProcessingControl->setWhiteBalanceMode(QCameraImageProcessing::WhiteBalanceFlash);
     mockCameraControl->mockImageProcessingControl->setSupportedWhiteBalanceModes(whiteBalanceModes);
@@ -708,7 +708,7 @@ void tst_QCamera::testEnumDebug()
 void tst_QCamera::testCameraControl()
 {
     QCamera camera;
-    MockCameraControl *m_cameraControl = new MockCameraControl(&camera);
+    QMockCamera *m_cameraControl = new QMockCamera(&camera);
     QVERIFY(m_cameraControl != nullptr);
 }
 
@@ -986,7 +986,7 @@ void tst_QCamera::testMaxOpticalZoomChangedSignal()
 void tst_QCamera :: testImageProcessingControl()
 {
     QObject parent;
-    MockImageProcessingControl processCtrl(&parent);
+    QMockCameraImageProcessing processCtrl(&parent);
 }
 
 void tst_QCamera::testSignalApertureChanged()
@@ -1096,7 +1096,7 @@ void tst_QCamera::testSignalFlashReady()
 void tst_QCamera::testExposureControlConstructor()
 {
     // To check changes in abstract classes's pure virtual functions
-    MockCameraExposureControl obj;
+    QMockCameraExposure obj;
 }
 
 QTEST_MAIN(tst_QCamera)
diff --git a/tests/auto/unit/multimedia/qcameraimagecapture/tst_qcameraimagecapture.cpp b/tests/auto/unit/multimedia/qcameraimagecapture/tst_qcameraimagecapture.cpp
index 26e0b2bdd..aeacd87b1 100644
--- a/tests/auto/unit/multimedia/qcameraimagecapture/tst_qcameraimagecapture.cpp
+++ b/tests/auto/unit/multimedia/qcameraimagecapture/tst_qcameraimagecapture.cpp
@@ -48,7 +48,7 @@ Reviewer Name       Date                Coverage ( Full / Test Case IDs ).
 #include <qcameraimagecapture.h>
 #include <qmediacapturesession.h>
 
-#include "mockmediarecorderservice.h"
+#include "qmockmediacapturesession.h"
 #include "qmockintegration_p.h"
 
 QT_USE_NAMESPACE
@@ -216,7 +216,7 @@ void tst_QCameraImageCapture::encodingSettings()
 //MaemoAPI-1830:test errors
 void tst_QCameraImageCapture::errors()
 {
-    MockMediaRecorderService::simpleCamera = true;
+    QMockMediaCaptureSession::simpleCamera = true;
 
     {
         QMediaCaptureSession session;
@@ -245,7 +245,7 @@ void tst_QCameraImageCapture::errors()
     QVERIFY(imageCapture.error() == QCameraImageCapture::NotReadyError);
     QVERIFY2(!imageCapture.errorString().isEmpty(), "Could not capture in stopped state");
 
-    MockMediaRecorderService::simpleCamera = false;
+    QMockMediaCaptureSession::simpleCamera = false;
 }
 
 //MaemoAPI-1831:test error
@@ -365,8 +365,8 @@ void tst_QCameraImageCapture::readyForCaptureChanged()
 //MaemoAPI-1853:test cameraImageCapture control constructor
 void tst_QCameraImageCapture::cameraImageCaptureControl()
 {
-    MockCameraControl ctrl;
-    MockCaptureControl capctrl(&ctrl);
+    QMockCamera ctrl;
+    QMockImageCapture capctrl(&ctrl);
 }
 
 QTEST_MAIN(tst_QCameraImageCapture)
diff --git a/tests/auto/unit/multimedia/qcamerainfo/tst_qcamerainfo.cpp b/tests/auto/unit/multimedia/qcamerainfo/tst_qcamerainfo.cpp
index 53f86c095..55cd97a59 100644
--- a/tests/auto/unit/multimedia/qcamerainfo/tst_qcamerainfo.cpp
+++ b/tests/auto/unit/multimedia/qcamerainfo/tst_qcamerainfo.cpp
@@ -34,7 +34,7 @@
 #include <qmediadevicemanager.h>
 
 #include "qmockintegration_p.h"
-#include "mockmediarecorderservice.h"
+#include "qmockmediacapturesession.h"
 
 QT_USE_NAMESPACE
 
@@ -59,7 +59,7 @@ private:
 
 void tst_QCameraInfo::initTestCase()
 {
-    MockMediaRecorderService::simpleCamera = false;
+    QMockMediaCaptureSession::simpleCamera = false;
 }
 
 void tst_QCameraInfo::init()
diff --git a/tests/auto/unit/multimedia/qmediaencoder/tst_qmediaencoder.cpp b/tests/auto/unit/multimedia/qmediaencoder/tst_qmediaencoder.cpp
index 8523bd516..107a74dc4 100644
--- a/tests/auto/unit/multimedia/qmediaencoder/tst_qmediaencoder.cpp
+++ b/tests/auto/unit/multimedia/qmediaencoder/tst_qmediaencoder.cpp
@@ -37,8 +37,8 @@
 #include <qmockintegration_p.h>
 #include <qmediacapturesession.h>
 
-#include "mockmediarecorderservice.h"
-#include "mockmediarecordercontrol.h"
+#include "qmockmediacapturesession.h"
+#include "qmockmediaencoder.h"
 
 QT_USE_NAMESPACE
 
@@ -86,8 +86,8 @@ private:
     QMockIntegration *mockIntegration = nullptr;
     QMediaCaptureSession *captureSession;
     QCamera *object = nullptr;
-    MockMediaRecorderService *service = nullptr;
-    MockMediaEncoderControl *mock;
+    QMockMediaCaptureSession *service = nullptr;
+    QMockMediaEncoder *mock;
     QMediaEncoder *capture;
 };
 
diff --git a/tests/auto/unit/multimedia/qmediaplayer/tst_qmediaplayer.cpp b/tests/auto/unit/multimedia/qmediaplayer/tst_qmediaplayer.cpp
index a187fcd5f..633e83c38 100644
--- a/tests/auto/unit/multimedia/qmediaplayer/tst_qmediaplayer.cpp
+++ b/tests/auto/unit/multimedia/qmediaplayer/tst_qmediaplayer.cpp
@@ -40,7 +40,7 @@
 #include <qobject.h>
 
 #include "qmockintegration_p.h"
-#include "mockmediaplayer.h"
+#include "qmockmediaplayer.h"
 #include "qvideosink.h"
 
 QT_USE_NAMESPACE
@@ -124,7 +124,7 @@ private:
     void setupCommonTestData();
 
     QMockIntegration *mockIntegration;
-    MockMediaPlayer *mockPlayer;
+    QMockMediaPlayer *mockPlayer;
     QMediaPlayer *player;
 };
 
diff --git a/tests/auto/unit/multimediawidgets/qcamerawidgets/tst_qcamerawidgets.cpp b/tests/auto/unit/multimediawidgets/qcamerawidgets/tst_qcamerawidgets.cpp
index 6b5e7ea2a..aa377a375 100644
--- a/tests/auto/unit/multimediawidgets/qcamerawidgets/tst_qcamerawidgets.cpp
+++ b/tests/auto/unit/multimediawidgets/qcamerawidgets/tst_qcamerawidgets.cpp
@@ -44,7 +44,7 @@
 #include <qvideowidget.h>
 #include <qvideosink.h>
 
-#include "mockmediarecorderservice.h"
+#include "qmockmediacapturesession.h"
 #include "qmockintegration_p.h"
 
 QT_USE_NAMESPACE