diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/matter/MatterDataProvider.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/matter/MatterDataProvider.kt
index 3dc8a157b..dc1e34769 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/matter/MatterDataProvider.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/matter/MatterDataProvider.kt
@@ -29,7 +29,7 @@ open class MatterDataProvider(val modid: String? = null) : DataProvider {
 	constructor(event: GatherDataEvent) : this(event.generator.packOutput, event.modContainer.namespace)
 
 	fun bindPackOutput(output: PackOutput) {
-		pathProvider = output.createPathProvider(PackOutput.Target.DATA_PACK, AndroidResearchManager.DIRECTORY)
+		pathProvider = output.createPathProvider(PackOutput.Target.DATA_PACK, MatterManager.MATTER_DIRECTORY)
 	}
 
 	protected val actions = LinkedHashMap<ResourceLocation, AbstractRegistryAction>()
@@ -1232,6 +1232,9 @@ open class MatterDataProvider(val modid: String? = null) : DataProvider {
 	}
 
 	override fun getName(): String {
+		if (modid != null)
+			return "Matter Data for mod $modid"
+
 		return "Matter Data"
 	}
 }