diff --git a/packages/TWM-Core/TWMHorizontalLayoutStrategy.class.st b/packages/TWM-Core/TWMHorizontalLayoutStrategy.class.st
index 3b1e9f2..5a4be91 100644
--- a/packages/TWM-Core/TWMHorizontalLayoutStrategy.class.st
+++ b/packages/TWM-Core/TWMHorizontalLayoutStrategy.class.st
@@ -24,7 +24,7 @@ TWMHorizontalLayoutStrategy >> tileWindows: windows [
 	windowWidth := clearArea width // numberOfColumns..
 	windowHeight := clearArea height // numberOfRows.
 	
-	Matrix 
+	Array2D 
 		rows: numberOfRows 
 		columns: numberOfColumns 
 		tabulate: 	[:row :column| 
diff --git a/packages/TWM-Core/TWMVerticalLayoutStrategy.class.st b/packages/TWM-Core/TWMVerticalLayoutStrategy.class.st
index dbb0938..3d87c39 100644
--- a/packages/TWM-Core/TWMVerticalLayoutStrategy.class.st
+++ b/packages/TWM-Core/TWMVerticalLayoutStrategy.class.st
@@ -24,7 +24,7 @@ TWMVerticalLayoutStrategy >> tileWindows: windows [
 	windowWidth := clearArea width // numberOfColumns..
 	windowHeight := clearArea height // numberOfRows.
 	
-	Matrix 
+	Array2D 
 		rows: numberOfColumns 
 		columns: numberOfRows 
 		tabulate: 	[:column :row|