diff --git a/JitsiConference.js b/JitsiConference.js
index fd1f19743a..76b1d50785 100644
--- a/JitsiConference.js
+++ b/JitsiConference.js
@@ -71,7 +71,7 @@ import {
     createJingleEvent,
     createP2PEvent
 } from './service/statistics/AnalyticsEvents';
-import * as XMPPEvents from './service/xmpp/XMPPEvents';
+import XMPPEvents from './service/xmpp/XMPPEvents';
 
 const logger = getLogger(__filename);
 
diff --git a/modules/RTC/TraceablePeerConnection.js b/modules/RTC/TraceablePeerConnection.js
index a16e93a00b..f87ce42689 100644
--- a/modules/RTC/TraceablePeerConnection.js
+++ b/modules/RTC/TraceablePeerConnection.js
@@ -8,7 +8,7 @@ import * as MediaType from '../../service/RTC/MediaType';
 import RTCEvents from '../../service/RTC/RTCEvents';
 import * as SignalingEvents from '../../service/RTC/SignalingEvents';
 import { getSourceNameForJitsiTrack } from '../../service/RTC/SignalingLayer';
-import * as VideoType from '../../service/RTC/VideoType';
+import VideoType from '../../service/RTC/VideoType';
 import { SS_DEFAULT_FRAME_RATE } from '../RTC/ScreenObtainer';
 import browser from '../browser';
 import FeatureFlags from '../flags/FeatureFlags';
diff --git a/modules/statistics/AvgRTPStatsReporter.js b/modules/statistics/AvgRTPStatsReporter.js
index eb8e1d6546..38f299b7c1 100644
--- a/modules/statistics/AvgRTPStatsReporter.js
+++ b/modules/statistics/AvgRTPStatsReporter.js
@@ -3,7 +3,7 @@ import isEqual from 'lodash.isequal';
 
 import * as ConferenceEvents from '../../JitsiConferenceEvents';
 import * as MediaType from '../../service/RTC/MediaType';
-import * as VideoType from '../../service/RTC/VideoType';
+import VideoType from '../../service/RTC/VideoType';
 import * as ConnectionQualityEvents
     from '../../service/connectivity/ConnectionQualityEvents';
 import {