diff --git a/chat/indico_chat/controllers/base.py b/chat/indico_chat/controllers/base.py
index f373358..71cba44 100644
--- a/chat/indico_chat/controllers/base.py
+++ b/chat/indico_chat/controllers/base.py
@@ -18,7 +18,7 @@ from __future__ import unicode_literals
 
 from flask import session, request
 
-from MaKaC.webinterface.rh.conferenceModif import RHConferenceModifBase
+from indico.legacy.webinterface.rh.conferenceModif import RHConferenceModifBase
 
 from indico_chat.models.chatrooms import ChatroomEventAssociation
 from indico_chat.util import is_chat_admin
diff --git a/chat/indico_chat/controllers/event.py b/chat/indico_chat/controllers/event.py
index a5bb649..3a5d719 100644
--- a/chat/indico_chat/controllers/event.py
+++ b/chat/indico_chat/controllers/event.py
@@ -18,7 +18,7 @@ from __future__ import unicode_literals
 
 from flask_pluginengine import current_plugin
 
-from MaKaC.webinterface.rh.conferenceDisplay import RHConferenceBaseDisplay
+from indico.legacy.webinterface.rh.conferenceDisplay import RHConferenceBaseDisplay
 
 from indico_chat.models.chatrooms import ChatroomEventAssociation
 from indico_chat.views import WPChatEventPage
diff --git a/chat/indico_chat/views.py b/chat/indico_chat/views.py
index 5e6406b..ac95c7e 100644
--- a/chat/indico_chat/views.py
+++ b/chat/indico_chat/views.py
@@ -17,7 +17,7 @@
 from __future__ import unicode_literals
 
 from indico.core.plugins import WPJinjaMixinPlugin
-from MaKaC.webinterface.pages.conferences import WPConferenceDefaultDisplayBase, WPConferenceModifBase
+from indico.legacy.webinterface.pages.conferences import WPConferenceDefaultDisplayBase, WPConferenceModifBase
 
 
 class WPChatEventPage(WPJinjaMixinPlugin, WPConferenceDefaultDisplayBase):
diff --git a/importer/indico_importer/controllers.py b/importer/indico_importer/controllers.py
index a261bdb..3f949ff 100644
--- a/importer/indico_importer/controllers.py
+++ b/importer/indico_importer/controllers.py
@@ -27,7 +27,7 @@ from werkzeug.exceptions import NotFound
 from indico.core.db import db
 from indico.modules.events.timetable.controllers import RHManageTimetableBase
 from indico.modules.events.timetable.models.entries import TimetableEntry, TimetableEntryType
-from MaKaC.webinterface.rh.base import RHProtected
+from indico.legacy.webinterface.rh.base import RHProtected
 
 
 class RHGetImporters(RHProtected):
diff --git a/importer_invenio/indico_importer_invenio/converters.py b/importer_invenio/indico_importer_invenio/converters.py
index 33f959e..a4c7d13 100644
--- a/importer_invenio/indico_importer_invenio/converters.py
+++ b/importer_invenio/indico_importer_invenio/converters.py
@@ -16,7 +16,7 @@
 
 from indico_importer.converter import APPEND, RecordConverter
 from indico_importer.util import convert_dt_tuple
-from MaKaC.webinterface.common.tools import strip_ml_tags
+from indico.legacy.webinterface.common.tools import strip_ml_tags
 
 
 class InvenioRecordConverterBase(RecordConverter):
diff --git a/livesync/indico_livesync/marcxml.py b/livesync/indico_livesync/marcxml.py
index 6feaaa4..0f2bd06 100644
--- a/livesync/indico_livesync/marcxml.py
+++ b/livesync/indico_livesync/marcxml.py
@@ -19,9 +19,9 @@ from __future__ import unicode_literals
 from flask_pluginengine import current_plugin
 
 from indico.modules.users import User
-from MaKaC.accessControl import AccessWrapper
-from MaKaC.common.output import outputGenerator
-from MaKaC.common.xmlGen import XMLGen
+from indico.legacy.accessControl import AccessWrapper
+from indico.legacy.common.output import outputGenerator
+from indico.legacy.common.xmlGen import XMLGen
 
 from indico.modules.categories.models.categories import Category
 from indico.modules.events.contributions.models.contributions import Contribution
diff --git a/payment_paypal/indico_payment_paypal/controllers.py b/payment_paypal/indico_payment_paypal/controllers.py
index 4b25d93..4abdfce 100644
--- a/payment_paypal/indico_payment_paypal/controllers.py
+++ b/payment_paypal/indico_payment_paypal/controllers.py
@@ -28,7 +28,7 @@ from indico.modules.events.payment.models.transactions import TransactionAction
 from indico.modules.events.payment.notifications import notify_amount_inconsistency
 from indico.modules.events.payment.util import register_transaction
 from indico.web.flask.util import url_for
-from MaKaC.webinterface.rh.base import RH
+from indico.legacy.webinterface.rh.base import RH
 
 from indico_payment_paypal import _
 
diff --git a/piwik/indico_piwik/controllers.py b/piwik/indico_piwik/controllers.py
index 523da89..655dd38 100644
--- a/piwik/indico_piwik/controllers.py
+++ b/piwik/indico_piwik/controllers.py
@@ -17,7 +17,7 @@
 from flask import jsonify
 
 from indico.core.config import Config
-from MaKaC.webinterface.rh.conferenceModif import RHConferenceModifBase
+from indico.legacy.webinterface.rh.conferenceModif import RHConferenceModifBase
 
 from indico_piwik.views import WPStatistics
 from indico_piwik.reports import (ReportCountries, ReportDevices, ReportDownloads, ReportGeneral, ReportMaterial,
diff --git a/piwik/indico_piwik/reports.py b/piwik/indico_piwik/reports.py
index f74686f..be3dd84 100644
--- a/piwik/indico_piwik/reports.py
+++ b/piwik/indico_piwik/reports.py
@@ -24,8 +24,8 @@ from indico.modules.events import Event
 from indico.modules.events.contributions import Contribution
 from indico.util.date_time import format_time
 from indico.util.serializer import Serializer
-from MaKaC.common.cache import GenericCache
-from MaKaC.common.timezoneUtils import nowutc, utc2server
+from indico.legacy.common.cache import GenericCache
+from indico.legacy.common.timezoneUtils import nowutc, utc2server
 
 from indico_piwik.queries.graphs import PiwikQueryReportEventGraphCountries, PiwikQueryReportEventGraphDevices
 from indico_piwik.queries.metrics import (PiwikQueryReportEventMetricDownloads,
diff --git a/piwik/indico_piwik/views.py b/piwik/indico_piwik/views.py
index ede037c..6915785 100644
--- a/piwik/indico_piwik/views.py
+++ b/piwik/indico_piwik/views.py
@@ -15,7 +15,7 @@
 # along with Indico; if not, see <http://www.gnu.org/licenses/>.
 
 from indico.core.plugins import WPJinjaMixinPlugin
-from MaKaC.webinterface.pages.conferences import WPConferenceModifBase
+from indico.legacy.webinterface.pages.conferences import WPConferenceModifBase
 
 
 class WPStatistics(WPJinjaMixinPlugin, WPConferenceModifBase):
diff --git a/previewer_jupyter/indico_previewer_jupyter/controllers.py b/previewer_jupyter/indico_previewer_jupyter/controllers.py
index 1914b99..9bf6707 100644
--- a/previewer_jupyter/indico_previewer_jupyter/controllers.py
+++ b/previewer_jupyter/indico_previewer_jupyter/controllers.py
@@ -24,7 +24,7 @@ from werkzeug.exceptions import Forbidden
 
 from indico.modules.attachments import Attachment
 
-from MaKaC.webinterface.rh.base import RH
+from indico.legacy.webinterface.rh.base import RH
 
 from indico_previewer_jupyter.cpp_highlighter import CppHighlighter
 
diff --git a/search/indico_search/controllers.py b/search/indico_search/controllers.py
index e78f96b..d7ea018 100644
--- a/search/indico_search/controllers.py
+++ b/search/indico_search/controllers.py
@@ -23,8 +23,8 @@ from werkzeug.wrappers import Response
 
 from indico.modules.categories import Category
 from indico.modules.events import Event
-from MaKaC.webinterface.rh.conferenceBase import RHCustomizable
-from MaKaC.webinterface.rh.base import RH
+from indico.legacy.webinterface.rh.conferenceBase import RHCustomizable
+from indico.legacy.webinterface.rh.base import RH
 
 from indico_search.views import WPSearchCategory, WPSearchConference
 
diff --git a/search/indico_search/views.py b/search/indico_search/views.py
index 7e6ab1c..7d86afc 100644
--- a/search/indico_search/views.py
+++ b/search/indico_search/views.py
@@ -18,7 +18,7 @@ from __future__ import unicode_literals
 
 from indico.core.plugins import WPJinjaMixinPlugin
 from indico.modules.categories.views import WPCategory
-from MaKaC.webinterface.pages.conferences import WPConferenceDefaultDisplayBase
+from indico.legacy.webinterface.pages.conferences import WPConferenceDefaultDisplayBase
 
 
 class WPSearchCategory(WPJinjaMixinPlugin, WPCategory):
diff --git a/vc_vidyo/indico_vc_vidyo/api/cache.py b/vc_vidyo/indico_vc_vidyo/api/cache.py
index 514b52b..69ef2c2 100644
--- a/vc_vidyo/indico_vc_vidyo/api/cache.py
+++ b/vc_vidyo/indico_vc_vidyo/api/cache.py
@@ -15,7 +15,7 @@
 # along with Indico; if not, see <http://www.gnu.org/licenses/>.
 
 from suds.cache import Cache
-from MaKaC.common.cache import GenericCache
+from indico.legacy.common.cache import GenericCache
 
 DEFAULT_CACHE_TTL = 24 * 3600
 
diff --git a/vc_vidyo/indico_vc_vidyo/plugin.py b/vc_vidyo/indico_vc_vidyo/plugin.py
index 5db2680..e8dac15 100644
--- a/vc_vidyo/indico_vc_vidyo/plugin.py
+++ b/vc_vidyo/indico_vc_vidyo/plugin.py
@@ -44,7 +44,7 @@ from indico_vc_vidyo.http_api import DeleteVCRoomAPI
 from indico_vc_vidyo.util import iter_user_identities, iter_extensions, update_room_from_obj
 from indico_vc_vidyo.models.vidyo_extensions import VidyoExtension
 
-from MaKaC.webinterface.pages.conferences import WPTPLConferenceDisplay
+from indico.legacy.webinterface.pages.conferences import WPTPLConferenceDisplay
 
 
 class PluginSettingsForm(VCPluginSettingsFormBase):