diff --git a/dist/src/assembly/no-dependencies.xml b/dist/src/assembly/no-dependencies.xml
index bed865d40..9e835bbcc 100644
--- a/dist/src/assembly/no-dependencies.xml
+++ b/dist/src/assembly/no-dependencies.xml
@@ -38,7 +38,7 @@
 			</includes>
 			<sources>
 				<outputDirectoryMapping>
-					samples/${artifactId}
+					samples/spring-batch-samples
 				</outputDirectoryMapping>
 				<fileSets>
 					<fileSet>
diff --git a/dist/src/assembly/with-dependencies.xml b/dist/src/assembly/with-dependencies.xml
index 79fbfef74..0b4e422c7 100644
--- a/dist/src/assembly/with-dependencies.xml
+++ b/dist/src/assembly/with-dependencies.xml
@@ -38,7 +38,7 @@
 			</includes>
 			<sources>
 				<outputDirectoryMapping>
-					samples/${artifactId}
+					samples/${module.artifactId}
 				</outputDirectoryMapping>
 				<fileSets>
 					<fileSet>
@@ -61,7 +61,7 @@
 			</includes>
 			<sources>
 				<outputDirectoryMapping>
-					sources/${artifactId}
+					sources/${module.artifactId}
 				</outputDirectoryMapping>
 				<fileSets>
 					<fileSet>
@@ -89,7 +89,7 @@
 				<dependencySets>
 					<dependencySet>
 						<outputFileNameMapping>
-							lib/${groupId}/${version}/${artifactId}-${version}.${extension}
+							lib/${module.groupId}/${module.version}/${module.artifactId}-${module.version}.${module.extension}
 						</outputFileNameMapping>
 						<scope>runtime</scope>
 						<excludes>
@@ -106,7 +106,7 @@
 					</dependencySet>
 					<dependencySet>
 						<outputFileNameMapping>
-							lib/${groupId}/${version}/${artifactId}-${version}.${extension}
+							lib/${module.groupId}/${module.version}/${module.artifactId}-${module.version}.${module.extension}
 						</outputFileNameMapping>
 						<scope>provided</scope>
 					</dependencySet>
@@ -126,7 +126,7 @@
 				<dependencySets>
 					<dependencySet>
 						<outputFileNameMapping>
-							lib/${groupId}/${version}/${artifactId}-${version}.${extension}
+							lib/${module.groupId}/${module.version}/${module.artifactId}-${module.version}.${module.extension}
 						</outputFileNameMapping>
 						<scope>runtime</scope>
 						<excludes>
@@ -143,7 +143,7 @@
 					</dependencySet>
 					<dependencySet>
 						<outputFileNameMapping>
-							lib/${groupId}/${version}/${artifactId}-${version}.${extension}
+							lib/${module.groupId}/${module.version}/${module.artifactId}-${module.version}.${module.extension}
 						</outputFileNameMapping>
 						<scope>provided</scope>
 						<excludes>
@@ -160,7 +160,7 @@
 					</dependencySet>
 					<dependencySet>
 						<outputFileNameMapping>
-							lib/${groupId}/${version}/${artifactId}-${version}.${extension}
+							lib/${module.groupId}/${module.version}/${module.artifactId}-${module.version}.${module.extension}
 						</outputFileNameMapping>
 						<scope>test</scope>
 						<excludes>