diff --git a/callwidget.cpp b/callwidget.cpp
index 846704fdb36cccad9e49059f0ae52ddcf090ecfa..4040d084cd26c826e2d883fcb2700bd108423b85 100644
--- a/callwidget.cpp
+++ b/callwidget.cpp
@@ -244,14 +244,14 @@ CallWidget::setupOutOfCallIM()
     connect(displayAuthor, &QAction::triggered, lamdba);
     connect(displayDate, &QAction::triggered, lamdba);
 
-    connect(&::Media::RecordingModel::instance(),
-            SIGNAL(newTextMessage(::Media::TextRecording*, ContactMethod*)),
+    connect(&::media::RecordingModel::instance(),
+            SIGNAL(newTextMessage(::media::TextRecording*, ContactMethod*)),
             this,
-            SLOT(onIncomingMessage(::Media::TextRecording*, ContactMethod*)));
+            SLOT(onIncomingMessage(::media::TextRecording*, ContactMethod*)));
 }
 
 void
-CallWidget::onIncomingMessage(::Media::TextRecording* t, ContactMethod* cm)
+CallWidget::onIncomingMessage(::media::TextRecording* t, ContactMethod* cm)
 {
     Q_UNUSED(cm)
 
@@ -261,7 +261,7 @@ CallWidget::onIncomingMessage(::Media::TextRecording* t, ContactMethod* cm)
         GlobalSystemTray::instance()
                 .showMessage("Ring",
                              QString(tr("Message incoming from %1")).arg(
-                                 idx.data((int)Media::TextRecording::Role::AuthorDisplayname).toString()));
+                                 idx.data((int)media::TextRecording::Role::AuthorDisplayname).toString()));
         QApplication::alert(this, 5000);
     }
 }
@@ -828,7 +828,7 @@ CallWidget::showIMOutOfCall(const QModelIndex& nodeIdx)
     ui->imMessageEdit->setFocus();
     disconnect(imClickedConnection_);
     imClickedConnection_ = connect(ui->listMessageView, &QListView::clicked, [this](const QModelIndex& index) {
-        auto urlList = index.data(static_cast<int>(Media::TextRecording::Role::LinkList)).value<QList<QUrl>>();
+        auto urlList = index.data(static_cast<int>(media::TextRecording::Role::LinkList)).value<QList<QUrl>>();
         if (urlList.size() == 1)
             QDesktopServices::openUrl(urlList.at(0));
         else if (urlList.size()) {
@@ -883,9 +883,9 @@ void CallWidget::on_contactMethodComboBox_currentIndexChanged(int index)
             if (imConnection_)
                 disconnect(imConnection_);
             imConnection_ = connect(txtRecording,
-                                    SIGNAL(messageInserted(QMap<QString,QString>,ContactMethod*,Media::Media::Direction)),
+                                    SIGNAL(messageInserted(QMap<QString,QString>,ContactMethod*,media::Media::Direction)),
                                     this,
-                                    SLOT(slotAccountMessageReceived(QMap<QString,QString>,ContactMethod*,Media::Media::Direction)));
+                                    SLOT(slotAccountMessageReceived(QMap<QString,QString>,ContactMethod*,media::Media::Direction)));
             auto messagesPresent = txtRecording->instantMessagingModel()->rowCount() > 0;
             if (messagesPresent) {
                 ui->listMessageView->scrollToBottom();
@@ -911,7 +911,7 @@ void CallWidget::on_contactMethodComboBox_currentIndexChanged(int index)
 void
 CallWidget::slotAccountMessageReceived(const QMap<QString,QString> message,
                                        ContactMethod* cm,
-                                       Media::Media::Direction dir)
+                                       media::Media::Direction dir)
 {
     Q_UNUSED(message)
     Q_UNUSED(dir)
diff --git a/callwidget.h b/callwidget.h
index c4ae65dad3b8de881be790ed61ec98944e84c353..f77d82e865221b5b3984291cd3637ace82fca71f 100644
--- a/callwidget.h
+++ b/callwidget.h
@@ -86,8 +86,8 @@ private slots:
     void callStateChanged(Call* call, Call::State previousState);
     void smartListCurrentChanged(const QModelIndex &currentIdx, const QModelIndex &previousIdx);
     void contactReqListCurrentChanged(const QModelIndex &currentIdx, const QModelIndex &previousIdx);
-    void slotAccountMessageReceived(const QMap<QString,QString> message,ContactMethod* cm,Media::Media::Direction dir);
-    void onIncomingMessage(::Media::TextRecording* t, ContactMethod* cm);
+    void slotAccountMessageReceived(const QMap<QString,QString> message,ContactMethod* cm, media::Media::Direction dir);
+    void onIncomingMessage(::media::TextRecording* t, ContactMethod* cm);
     void callChangedSlot();
     void contactLineEdit_registeredNameFound(Account *account, NameDirectory::LookupStatus status, const QString& address, const QString& name);
     void searchBtnClicked();
diff --git a/configurationwidget.cpp b/configurationwidget.cpp
index 437d8292a48437a6c88d6d77623ad285ea88d45b..67e93886f31d11ac4202a79a04283c444d854214 100644
--- a/configurationwidget.cpp
+++ b/configurationwidget.cpp
@@ -136,16 +136,16 @@ ConfigurationWidget::ConfigurationWidget(QWidget *parent) :
 
     ui->videoView->setIsFullPreview(true);
 
-    auto recordPath = Media::RecordingModel::instance().recordPath();
+    auto recordPath = media::RecordingModel::instance().recordPath();
     if (recordPath.isEmpty()) {
         recordPath = QDir::toNativeSeparators(QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation));
-        Media::RecordingModel::instance().setRecordPath(recordPath);
+        media::RecordingModel::instance().setRecordPath(recordPath);
     }
-    ui->recordPath->setText(Media::RecordingModel::instance().recordPath());
+    ui->recordPath->setText(media::RecordingModel::instance().recordPath());
 
-    ui->alwaysRecordCheckBox->setChecked(Media::RecordingModel::instance().isAlwaysRecording());
+    ui->alwaysRecordCheckBox->setChecked(media::RecordingModel::instance().isAlwaysRecording());
     connect(ui->alwaysRecordCheckBox, &QCheckBox::clicked, [](bool checked){
-        Media::RecordingModel::instance().setAlwaysRecording(checked);
+        media::RecordingModel::instance().setAlwaysRecording(checked);
     });
 
     connect(ui->generalTabButton, &QPushButton::toggled, [=] (bool toggled) {
@@ -387,11 +387,11 @@ void
 ConfigurationWidget::on_recordPath_clicked()
 {
     QString dir = QFileDialog::getExistingDirectory(this, tr("Choose Directory"),
-                                                 Media::RecordingModel::instance().recordPath(),
+                                                 media::RecordingModel::instance().recordPath(),
                                                  QFileDialog::ShowDirsOnly
                                                  | QFileDialog::DontResolveSymlinks);
     if (not dir.isEmpty()) {
-        Media::RecordingModel::instance().setRecordPath(dir);
+        media::RecordingModel::instance().setRecordPath(dir);
         ui->recordPath->setText(dir);
     }
 }
diff --git a/imdelegate.cpp b/imdelegate.cpp
index 76f3cb0cab774ddc2ba1cd31a2231a8a31a15395..55f10d03b8f8a9e51817a417253626872811a64d 100644
--- a/imdelegate.cpp
+++ b/imdelegate.cpp
@@ -41,11 +41,11 @@ ImDelegate::formatMsg(const QModelIndex& index, QString& msg) const
     QStringList meta;
     if (settings.value(SettingsKey::imShowAuthor).toBool()) {
         meta << index.data(
-                    static_cast<int>(Media::TextRecording::Role::AuthorDisplayname)).toString();
+                    static_cast<int>(media::TextRecording::Role::AuthorDisplayname)).toString();
     }
     if (settings.value(SettingsKey::imShowDate).toBool()) {
         auto timeStamp = index.data(
-                    static_cast<int>(Media::TextRecording::Role::Timestamp)).value<uint>();
+                    static_cast<int>(media::TextRecording::Role::Timestamp)).value<uint>();
         auto date = QDateTime::fromTime_t(timeStamp);
         auto now = QDateTime::currentDateTime();
         if (now.date() == date.date())
@@ -69,12 +69,12 @@ ImDelegate::paint(QPainter* painter,
     painter->setFont(fontMsg_);
 
     if (index.isValid()) {
-        auto msg = index.data(static_cast<int>(Media::TextRecording::Role::FormattedHtml)).toString();
+        auto msg = index.data(static_cast<int>(media::TextRecording::Role::FormattedHtml)).toString();
         opt.text.clear();
         QStyle* style = opt.widget ? opt.widget->style() : QApplication::style();
 
-        auto dir = index.data(static_cast<int>(Media::TextRecording::Role::Direction))
-                .value<Media::Media::Direction>() == Media::Media::Direction::IN
+        auto dir = index.data(static_cast<int>(media::TextRecording::Role::Direction))
+                .value<media::Media::Direction>() == media::Media::Direction::IN
                 ? Qt::AlignLeft : Qt::AlignRight;
 
         formatMsg(index, msg);
@@ -156,11 +156,11 @@ ImDelegate::sizeHint(const QStyleOptionViewItem& option,
     QStyleOptionViewItem opt = option;
     opt.font = fontMsg_;
 
-    QString msg = index.data(static_cast<int>(Media::TextRecording::Role::FormattedHtml)).toString();
+    QString msg = index.data(static_cast<int>(media::TextRecording::Role::FormattedHtml)).toString();
 
     auto dir = index.data(
-                static_cast<int>(Media::TextRecording::Role::Direction))
-            .value<Media::Media::Direction>() == Media::Media::Direction::IN
+                static_cast<int>(media::TextRecording::Role::Direction))
+            .value<media::Media::Direction>() == media::Media::Direction::IN
             ? Qt::AlignLeft : Qt::AlignRight;
 
     formatMsg(index, msg);
diff --git a/instantmessagingwidget.cpp b/instantmessagingwidget.cpp
index 833798e76b82fcbbae38ee51e816519c84ae8276..95cce48958e86ccd0a51e102cfc982850c53692d 100644
--- a/instantmessagingwidget.cpp
+++ b/instantmessagingwidget.cpp
@@ -77,13 +77,13 @@ InstantMessagingWidget::setMediaText(Call *call)
     ui->listMessageView->disconnect();
     ui->messageEdit->disconnect();
     if (call != nullptr) {
-        connect(call, SIGNAL(mediaAdded(Media::Media*)),
-                this, SLOT(mediaAdd(Media::Media*)));
-        Media::Text *textMedia = nullptr;
-        if (call->hasMedia(Media::Media::Type::TEXT, Media::Media::Direction::OUT)) {
-            textMedia = call->firstMedia<Media::Text>(Media::Media::Direction::OUT);
+        connect(call, SIGNAL(mediaAdded(media::Media*)),
+                this, SLOT(mediaAdd(media::Media*)));
+        media::Text *textMedia = nullptr;
+        if (call->hasMedia(media::Media::Type::TEXT, media::Media::Direction::OUT)) {
+            textMedia = call->firstMedia<media::Text>(media::Media::Direction::OUT);
         } else {
-            textMedia = call->addOutgoingMedia<Media::Text>();
+            textMedia = call->addOutgoingMedia<media::Text>();
         }
         if (textMedia) {
             ui->listMessageView->setModel(
@@ -105,23 +105,23 @@ InstantMessagingWidget::setMediaText(Call *call)
 }
 
 void
-InstantMessagingWidget::mediaAdd(Media::Media *media)
+InstantMessagingWidget::mediaAdd(media::Media *media)
 {
     switch(media->type()) {
-    case Media::Media::Type::AUDIO:
+    case media::Media::Type::AUDIO:
         break;
-    case Media::Media::Type::VIDEO:
+    case media::Media::Type::VIDEO:
         break;
-    case Media::Media::Type::TEXT:
-        if (media->direction() == Media::Text::Direction::IN) {
-            connect(static_cast<Media::Text*>(media),
+    case media::Media::Type::TEXT:
+        if (media->direction() == media::Text::Direction::IN) {
+            connect(static_cast<media::Text*>(media),
                     SIGNAL(messageReceived(QMap<QString,QString>)),
                     this,
                     SLOT(onMsgReceived(QMap<QString,QString>)));
             this->show();
         }
         break;
-    case Media::Media::Type::FILE:
+    case media::Media::Type::FILE:
         break;
     default:
         break;
diff --git a/instantmessagingwidget.h b/instantmessagingwidget.h
index 6d5d3d47c98c847d08e6eaca4a597f56f55bc3b1..e67f7d7f1fed3a85558bb6900ded075bb9af041f 100644
--- a/instantmessagingwidget.h
+++ b/instantmessagingwidget.h
@@ -49,7 +49,7 @@ private slots:
     void on_sendButton_clicked();
 
 private slots:
-    void mediaAdd(Media::Media *media);
+    void mediaAdd(media::Media *media);
     void onMsgReceived(const QMap<QString, QString>& message);
 
 private:
diff --git a/selectareadialog.cpp b/selectareadialog.cpp
index 7154cac989ecf70599512f25998fdc3292774a84..f3dd3225c882e8be233290237613236768a43d7c 100644
--- a/selectareadialog.cpp
+++ b/selectareadialog.cpp
@@ -87,7 +87,7 @@ SelectAreaDialog::mouseReleaseEvent(QMouseEvent* event)
         QApplication::restoreOverrideCursor();
         releaseMouse();
         if (auto call = CallModel::instance().selectedCall()) {
-            if (auto outVideo = call->firstMedia<Media::Video>(Media::Media::Direction::OUT)) {
+            if (auto outVideo = call->firstMedia<media::Video>(media::Media::Direction::OUT)) {
                 QRect realRect = rubberBand_->geometry();
 #ifdef Q_OS_WIN
                 if (QGuiApplication::primaryScreen()->devicePixelRatio() > 1.0) {
diff --git a/videoview.cpp b/videoview.cpp
index e8e9fb61175ac6a871dae58abe71e2096c54272f..67a0483b56bed6621cb969e2e8cebda748f9d777 100644
--- a/videoview.cpp
+++ b/videoview.cpp
@@ -175,7 +175,7 @@ VideoView::dropEvent(QDropEvent* event)
 {
     auto urls = event->mimeData()->urls();
     if (auto call = CallModel::instance().selectedCall()) {
-        if (auto outVideo = call->firstMedia<Media::Video>(Media::Media::Direction::OUT)) {
+        if (auto outVideo = call->firstMedia<media::Video>(media::Media::Direction::OUT)) {
             outVideo->sourceModel()->setFile(urls.at(0));
         }
     }
@@ -204,11 +204,11 @@ VideoView::showContextMenu(const QPoint& pos)
     QPoint globalPos = this->mapToGlobal(pos);
 
     QMenu menu;
-    Media::Video* outVideo = nullptr;
+    media::Video* outVideo = nullptr;
     int activeIndex = -1;
 
     if (auto call = CallModel::instance().selectedCall()) {
-        outVideo = call->firstMedia<Media::Video>(Media::Media::Direction::OUT);
+        outVideo = call->firstMedia<media::Video>(media::Media::Direction::OUT);
         if (outVideo)
             activeIndex = outVideo->sourceModel()->activeIndex();
     }