diff --git a/src/libcalamaresui/modulesystem/Module.cpp b/src/libcalamaresui/modulesystem/Module.cpp
index 2d2ea3def..227e25a2d 100644
--- a/src/libcalamaresui/modulesystem/Module.cpp
+++ b/src/libcalamaresui/modulesystem/Module.cpp
@@ -57,7 +57,7 @@ Module::Module()
 Module::~Module() {}
 
 void
-Module::initFrom( const QVariantMap& moduleDescriptor, const QString& id )
+Module::initFrom( const Calamares::ModuleSystem::Descriptor& moduleDescriptor, const QString& id )
 {
     m_key = ModuleSystem::InstanceKey( moduleDescriptor.value( "name" ).toString(), id );
     if ( moduleDescriptor.contains( EMERGENCY ) )
@@ -67,7 +67,7 @@ Module::initFrom( const QVariantMap& moduleDescriptor, const QString& id )
 }
 
 Module*
-Module::fromDescriptor( const QVariantMap& moduleDescriptor,
+Module::fromDescriptor( const Calamares::ModuleSystem::Descriptor& moduleDescriptor,
                         const QString& instanceId,
                         const QString& configFileName,
                         const QString& moduleDirectory )
diff --git a/src/libcalamaresui/modulesystem/ModuleManager.cpp b/src/libcalamaresui/modulesystem/ModuleManager.cpp
index 7e3b45c7f..c3e9569ef 100644
--- a/src/libcalamaresui/modulesystem/ModuleManager.cpp
+++ b/src/libcalamaresui/modulesystem/ModuleManager.cpp
@@ -142,7 +142,7 @@ ModuleManager::loadedInstanceKeys()
 }
 
 
-QVariantMap
+Calamares::ModuleSystem::Descriptor
 ModuleManager::moduleDescriptor( const QString& name )
 {
     return m_availableDescriptorsByModuleName.value( name );