API proposal: Layout prefix for LayoutModifiers A common report so far is that layout modifiers are difficult to discover and sometimes remember. They lack a common autocomplete stem that would permit easier discovery in the IDE. Additionally, as new layout modifiers have been introduced they've created namespace confusion at point of use, impairing readability. This change introduces, "Layout" as a common prefix for LayoutModifier accessors, mirroring Android's historical use of "layout_" prefixes in XML attributes that affect layout behavior of a child within a parent. This is phase one of a series of intended changes that will also change the organization of some of these modifiers to allow for closer grouping and discoverability of related modifiers, especially around size, with a leaning to familiar Android constructs. Also rename Spacing to LayoutPadding under the new convention, as Spacing never really stuck. (Though it did prevent confusion with Android's historical layout_padding.) Test: all existing tests Change-Id: I2fad064aab900081859efac52cf7ad663abfd30e

commit: 712dc996d5f5d278fb791599cda8d1c4b74c67f5 [log] [tgz]
author: Adam Powell <adamp@google.com> Wed Dec 04 12:48:30 2019 -0800
committer: Adam Powell <adamp@google.com> Fri Dec 06 10:48:09 2019 -0800
tree: aeff2436f3960d53b47de7409f568079aa2ece3a
parent: 0c66cf8453af80b9268e91114760134c7cb8aed6 [diff]
diff --git a/compose/compose-runtime/compose-runtime-benchmark/src/androidTest/java/androidx/compose/benchmark/DbMonsterBenchmark.kt b/compose/compose-runtime/compose-runtime-benchmark/src/androidTest/java/androidx/compose/benchmark/DbMonsterBenchmark.kt
index a9787c1..10b5555 100644
--- a/compose/compose-runtime/compose-runtime-benchmark/src/androidTest/java/androidx/compose/benchmark/DbMonsterBenchmark.kt
+++ b/compose/compose-runtime/compose-runtime-benchmark/src/androidTest/java/androidx/compose/benchmark/DbMonsterBenchmark.kt

@@ -22,7 +22,7 @@
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
 import androidx.ui.layout.Column
-import androidx.ui.layout.ExpandedHeight
+import androidx.ui.layout.LayoutExpandedHeight
 import org.junit.FixMethodOrder
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -60,7 +60,7 @@
         val list = DatabaseList(count, random)
         measureRecompose {
             compose {
-                Column(ExpandedHeight) {
+                Column(LayoutExpandedHeight) {
                     for (db in list.databases) {
                         DatabaseRow(db = db)
                     }

diff --git a/compose/compose-runtime/compose-runtime-benchmark/src/androidTest/java/androidx/compose/benchmark/dbmonster/DbMonster.kt b/compose/compose-runtime/compose-runtime-benchmark/src/androidTest/java/androidx/compose/benchmark/dbmonster/DbMonster.kt
index 8f8b11e..4ee000c 100644
--- a/compose/compose-runtime/compose-runtime-benchmark/src/androidTest/java/androidx/compose/benchmark/dbmonster/DbMonster.kt
+++ b/compose/compose-runtime/compose-runtime-benchmark/src/androidTest/java/androidx/compose/benchmark/dbmonster/DbMonster.kt

@@ -20,8 +20,8 @@
 import androidx.compose.Model
 import androidx.ui.core.Text
 import androidx.ui.layout.Column
-import androidx.ui.layout.ExpandedHeight
-import androidx.ui.layout.ExpandedWidth
+import androidx.ui.layout.LayoutExpandedHeight
+import androidx.ui.layout.LayoutExpandedWidth
 import androidx.ui.layout.Row
 
 import kotlin.random.Random
@@ -73,7 +73,7 @@
 @Composable
 fun QueryColumn(query: Query) {
     // TODO: we could do some conditional styling here which would make the test better
-    Column(ExpandedHeight) {
+    Column(LayoutExpandedHeight) {
         Text(text = "${query.elapsed}")
         Text(text = query.query)
     }
@@ -84,9 +84,9 @@
     println(db)
     val columns = 5
     val topQueries = db.topQueries(columns)
-    Row(ExpandedWidth) {
-        Column(ExpandedHeight) { Text(text = db.name) }
-        Column(ExpandedHeight) { Text(text = "${db.queries.size}") }
+    Row(LayoutExpandedWidth) {
+        Column(LayoutExpandedHeight) { Text(text = db.name) }
+        Column(LayoutExpandedHeight) { Text(text = "${db.queries.size}") }
         topQueries.forEach { query ->
             QueryColumn(query = query)
         }

diff --git a/compose/compose-runtime/compose-runtime-benchmark/src/androidTest/java/androidx/compose/benchmark/deeptree/DeepTree.kt b/compose/compose-runtime/compose-runtime-benchmark/src/androidTest/java/androidx/compose/benchmark/deeptree/DeepTree.kt
index 77fadad..857d678 100644
--- a/compose/compose-runtime/compose-runtime-benchmark/src/androidTest/java/androidx/compose/benchmark/deeptree/DeepTree.kt
+++ b/compose/compose-runtime/compose-runtime-benchmark/src/androidTest/java/androidx/compose/benchmark/deeptree/DeepTree.kt

@@ -21,8 +21,8 @@
 import androidx.ui.foundation.ColoredRect
 import androidx.ui.graphics.Color
 import androidx.ui.layout.Column
-import androidx.ui.layout.ExpandedHeight
-import androidx.ui.layout.ExpandedWidth
+import androidx.ui.layout.LayoutExpandedHeight
+import androidx.ui.layout.LayoutExpandedWidth
 import androidx.ui.layout.FlexScope
 import androidx.ui.layout.Row
 
@@ -39,9 +39,9 @@
 @Composable
 fun Stack(vertical: Boolean, children: @Composable() FlexScope.() -> Unit) {
     if (vertical) {
-        Column(ExpandedHeight, children = children)
+        Column(LayoutExpandedHeight, children = children)
     } else {
-        Row(ExpandedWidth, children = children)
+        Row(LayoutExpandedWidth, children = children)
     }
 }
 

diff --git a/compose/compose-runtime/compose-runtime-benchmark/src/androidTest/java/androidx/compose/benchmark/siblings/SiblingManagement.kt b/compose/compose-runtime/compose-runtime-benchmark/src/androidTest/java/androidx/compose/benchmark/siblings/SiblingManagement.kt
index b333cb0..17bf161 100644
--- a/compose/compose-runtime/compose-runtime-benchmark/src/androidTest/java/androidx/compose/benchmark/siblings/SiblingManagement.kt
+++ b/compose/compose-runtime/compose-runtime-benchmark/src/androidTest/java/androidx/compose/benchmark/siblings/SiblingManagement.kt

@@ -24,8 +24,8 @@
 import androidx.ui.foundation.ColoredRect
 import androidx.ui.graphics.Color
 import androidx.ui.layout.Column
-import androidx.ui.layout.ExpandedHeight
-import androidx.ui.layout.ExpandedWidth
+import androidx.ui.layout.LayoutExpandedHeight
+import androidx.ui.layout.LayoutExpandedWidth
 import androidx.ui.layout.Row
 import androidx.ui.text.TextStyle
 import kotlin.random.Random
@@ -37,7 +37,7 @@
         1 -> Color.Black
         else -> Color.Magenta
     }
-    Row(ExpandedWidth) {
+    Row(LayoutExpandedWidth) {
         ColoredRect(color = color, width = 16.dp, height = 16.dp)
         Text(text = "${item.id}", style = TextStyle(color = color))
     }
@@ -53,7 +53,7 @@
         1 -> Color.Black
         else -> Color.Magenta
     }
-    Row(ExpandedWidth) {
+    Row(LayoutExpandedWidth) {
         ColoredRect(color = color, width = 16.dp, height = 16.dp)
         Text(text = "${item.id}", style = TextStyle(color = color))
     }
@@ -102,7 +102,7 @@
 
 @Composable
 fun SiblingManagement(identity: IdentityType, items: List<Item>) {
-    Column(ExpandedHeight) {
+    Column(LayoutExpandedHeight) {
         when (identity) {
             IdentityType.Pivotal -> {
                 for (item in items) {

diff --git a/ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/SpacingBenchmark.kt b/ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/SpacingBenchmark.kt
index adaaecc..3381cfd 100644
--- a/ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/SpacingBenchmark.kt
+++ b/ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/SpacingBenchmark.kt

@@ -35,8 +35,8 @@
 import androidx.ui.core.Dp
 import androidx.ui.core.dp
 import androidx.ui.layout.Container
+import androidx.ui.layout.LayoutPadding
 import androidx.ui.layout.Padding
-import androidx.ui.layout.Spacing
 import androidx.ui.test.ComposeTestCase
 import androidx.ui.test.ToggleableTestCase
 import org.junit.Rule
@@ -191,7 +191,7 @@
 
     @Composable
     override fun emitPaddedContainer(padding: Dp, child: @Composable() () -> Unit) {
-        Container(expanded = true, modifier = Spacing(padding), children = child)
+        Container(expanded = true, modifier = LayoutPadding(padding), children = child)
     }
 }
 

diff --git a/ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/core/WithConstraintsBenchmark.kt b/ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/core/WithConstraintsBenchmark.kt
index c84a1c9..30f87d6 100644
--- a/ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/core/WithConstraintsBenchmark.kt
+++ b/ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/core/WithConstraintsBenchmark.kt

@@ -26,7 +26,7 @@
 import androidx.ui.benchmark.toggleStateBenchmarkMeasureLayout
 import androidx.ui.core.Placeable.PlacementScope.place
 import androidx.ui.layout.Container
-import androidx.ui.layout.Size
+import androidx.ui.layout.LayoutSize
 import androidx.ui.layout.Spacer
 import androidx.ui.test.ComposeTestCase
 import androidx.ui.test.ToggleableTestCase
@@ -67,7 +67,7 @@
         val size = +state { 200.dp }
         this.state = size
         Container(width = 300.dp, height = 300.dp) {
-            Spacer(Size(width = size.value, height = size.value))
+            Spacer(LayoutSize(width = size.value, height = size.value))
         }
     }
 
@@ -86,7 +86,7 @@
         this.state = size
         WithConstraints {
             Container(width = 300.dp, height = 300.dp) {
-                Spacer(Size(width = size.value, height = size.value))
+                Spacer(LayoutSize(width = size.value, height = size.value))
             }
         }
     }

diff --git a/ui/integration-tests/test/src/main/java/androidx/ui/test/cases/NestedScrollerTestCase.kt b/ui/integration-tests/test/src/main/java/androidx/ui/test/cases/NestedScrollerTestCase.kt
index cd8e9029..4f0aa48 100644
--- a/ui/integration-tests/test/src/main/java/androidx/ui/test/cases/NestedScrollerTestCase.kt
+++ b/ui/integration-tests/test/src/main/java/androidx/ui/test/cases/NestedScrollerTestCase.kt

@@ -30,8 +30,8 @@
 import androidx.ui.layout.Row
 import androidx.ui.foundation.ScrollerPosition
 import androidx.ui.foundation.VerticalScroller
-import androidx.ui.layout.ExpandedWidth
-import androidx.ui.layout.Gravity
+import androidx.ui.layout.LayoutExpandedWidth
+import androidx.ui.layout.LayoutGravity
 import androidx.ui.material.MaterialTheme
 import androidx.ui.material.surface.Surface
 import androidx.ui.test.ComposeTestCase
@@ -68,7 +68,7 @@
     fun SquareRow(useScrollerPosition: Boolean) {
         val playStoreColor = Color(red = 0x00, green = 0x00, blue = 0x80)
         val content = @Composable {
-            Row(ExpandedWidth) {
+            Row(LayoutExpandedWidth) {
                 repeat(6) {
                     WithDensity {
                         FlexColumn {
@@ -88,17 +88,17 @@
                                     text = "Some title",
                                     style = TextStyle(Color.Black, 60.px.toSp())
                                 )
-                                Row(ExpandedWidth) {
+                                Row(LayoutExpandedWidth) {
                                     Text(
                                         "3.5 ★",
                                         style = TextStyle(fontSize = 40.px.toSp()),
-                                        modifier = Gravity.Center
+                                        modifier = LayoutGravity.Center
                                     )
                                     ColoredRect(
                                         width = 40.px.toDp(),
                                         height = 40.px.toDp(),
                                         color = playStoreColor,
-                                        modifier = Gravity.Center
+                                        modifier = LayoutGravity.Center
                                     )
                                 }
                             }

diff --git a/ui/integration-tests/test/src/main/java/androidx/ui/test/cases/ScrollerTestCase.kt b/ui/integration-tests/test/src/main/java/androidx/ui/test/cases/ScrollerTestCase.kt
index de1288b..a7215b8 100644
--- a/ui/integration-tests/test/src/main/java/androidx/ui/test/cases/ScrollerTestCase.kt
+++ b/ui/integration-tests/test/src/main/java/androidx/ui/test/cases/ScrollerTestCase.kt

@@ -30,7 +30,7 @@
 import androidx.ui.foundation.VerticalScroller
 import androidx.ui.graphics.Paint
 import androidx.ui.graphics.PaintingStyle
-import androidx.ui.layout.ExpandedHeight
+import androidx.ui.layout.LayoutExpandedHeight
 import androidx.ui.test.ComposeTestCase
 import androidx.ui.test.ToggleableTestCase
 
@@ -45,7 +45,7 @@
         VerticalScroller(
             scrollerPosition = scrollerPosition
         ) {
-            Column(ExpandedHeight) {
+            Column(LayoutExpandedHeight) {
                 for (green in 0..0xFF) {
                     ColorStripe(0xFF, green, 0)
                 }

diff --git a/ui/ui-animation/integration-tests/animation-demos/src/main/java/androidx/ui/animation/demos/SpringBackScrolling.kt b/ui/ui-animation/integration-tests/animation-demos/src/main/java/androidx/ui/animation/demos/SpringBackScrolling.kt
index 588b5a5..63ca6e3 100644
--- a/ui/ui-animation/integration-tests/animation-demos/src/main/java/androidx/ui/animation/demos/SpringBackScrolling.kt
+++ b/ui/ui-animation/integration-tests/animation-demos/src/main/java/androidx/ui/animation/demos/SpringBackScrolling.kt

@@ -44,7 +44,7 @@
 import androidx.ui.layout.Padding
 import androidx.ui.graphics.Canvas
 import androidx.ui.graphics.Paint
-import androidx.ui.layout.ExpandedHeight
+import androidx.ui.layout.LayoutExpandedHeight
 import androidx.ui.text.TextStyle
 import kotlin.math.roundToInt
 
@@ -59,7 +59,7 @@
 
     @Composable
     fun SpringBackExample() {
-        Column(ExpandedHeight) {
+        Column(LayoutExpandedHeight) {
             Padding(40.dp) {
                 Text("<== Scroll horizontally ==>", style = TextStyle(fontSize = 20.sp))
             }

diff --git a/ui/ui-foundation/integration-tests/foundation-demos/src/main/java/androidx/ui/foundation/demos/AnimatedDraggableActivity.kt b/ui/ui-foundation/integration-tests/foundation-demos/src/main/java/androidx/ui/foundation/demos/AnimatedDraggableActivity.kt
index f93b3c8..c21d839 100644
--- a/ui/ui-foundation/integration-tests/foundation-demos/src/main/java/androidx/ui/foundation/demos/AnimatedDraggableActivity.kt
+++ b/ui/ui-foundation/integration-tests/foundation-demos/src/main/java/androidx/ui/foundation/demos/AnimatedDraggableActivity.kt

@@ -23,7 +23,7 @@
 import androidx.ui.foundation.samples.AnchoredDraggableSample
 import androidx.ui.foundation.samples.DraggableSample
 import androidx.ui.layout.Column
-import androidx.ui.layout.Height
+import androidx.ui.layout.LayoutHeight
 import androidx.ui.layout.Spacer
 import androidx.ui.layout.Wrap
 
@@ -35,7 +35,7 @@
             Wrap {
                 Column {
                     DraggableSample()
-                    Spacer(Height(100.dp))
+                    Spacer(LayoutHeight(100.dp))
                     AnchoredDraggableSample()
                 }
             }

diff --git a/ui/ui-foundation/integration-tests/samples/src/main/java/androidx/ui/foundation/samples/ScrollerSamples.kt b/ui/ui-foundation/integration-tests/samples/src/main/java/androidx/ui/foundation/samples/ScrollerSamples.kt
index 670f1ed..333c091 100644
--- a/ui/ui-foundation/integration-tests/samples/src/main/java/androidx/ui/foundation/samples/ScrollerSamples.kt
+++ b/ui/ui-foundation/integration-tests/samples/src/main/java/androidx/ui/foundation/samples/ScrollerSamples.kt

@@ -36,9 +36,9 @@
 import androidx.ui.graphics.Color
 import androidx.ui.layout.Column
 import androidx.ui.layout.Container
+import androidx.ui.layout.LayoutPadding
 import androidx.ui.layout.Padding
 import androidx.ui.layout.Row
-import androidx.ui.layout.Spacing
 import androidx.ui.layout.Table
 import androidx.ui.text.TextStyle
 
@@ -89,7 +89,7 @@
     val style = TextStyle(fontSize = 30.sp)
     // Scroller will be clipped to this padding
     VerticalScroller {
-        Column(modifier = Spacing(20.dp)) {
+        Column(modifier = LayoutPadding(20.dp)) {
             phrases.forEach { phrase ->
                 Text(text = phrase, style = style)
             }

diff --git a/ui/ui-foundation/integration-tests/samples/src/main/java/androidx/ui/foundation/samples/TableBordersSamples.kt b/ui/ui-foundation/integration-tests/samples/src/main/java/androidx/ui/foundation/samples/TableBordersSamples.kt
index b3ec690..f17c97a 100644
--- a/ui/ui-foundation/integration-tests/samples/src/main/java/androidx/ui/foundation/samples/TableBordersSamples.kt
+++ b/ui/ui-foundation/integration-tests/samples/src/main/java/androidx/ui/foundation/samples/TableBordersSamples.kt

@@ -23,7 +23,7 @@
 import androidx.ui.foundation.drawBorders
 import androidx.ui.foundation.shape.border.Border
 import androidx.ui.graphics.Color
-import androidx.ui.layout.AspectRatio
+import androidx.ui.layout.LayoutAspectRatio
 import androidx.ui.layout.Padding
 import androidx.ui.layout.Table
 
@@ -47,7 +47,7 @@
                 tableRow {
                     repeat(8) {
                         Padding(2.dp) {
-                            ColoredRect(color = Color.Magenta, modifier = AspectRatio(1f))
+                            ColoredRect(color = Color.Magenta, modifier = LayoutAspectRatio(1f))
                         }
                     }
                 }

diff --git a/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/BackgroundTest.kt b/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/BackgroundTest.kt
index 62b9cde..4c18a63 100644
--- a/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/BackgroundTest.kt
+++ b/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/BackgroundTest.kt

@@ -31,7 +31,7 @@
 import androidx.ui.graphics.SolidColor
 import androidx.ui.layout.Align
 import androidx.ui.layout.Container
-import androidx.ui.layout.Spacing
+import androidx.ui.layout.LayoutPadding
 import androidx.ui.semantics.Semantics
 import androidx.ui.test.assertShape
 import androidx.ui.test.captureToBitmap
@@ -63,7 +63,7 @@
                     Container(
                         width = 20.px.toDp(),
                         height = 20.px.toDp(),
-                        modifier = Spacing(10.px.toDp()) wraps background(Color.White)
+                        modifier = LayoutPadding(10.px.toDp()) wraps background(Color.White)
                     ) {}
                 }
             }
@@ -89,7 +89,7 @@
                     Container(
                         width = 20.px.toDp(),
                         height = 20.px.toDp(),
-                        modifier = Spacing(10.px.toDp()) wraps background(
+                        modifier = LayoutPadding(10.px.toDp()) wraps background(
                             SolidColor(
                                 Color.White
                             )

diff --git a/ui/ui-framework/integration-tests/framework-demos/src/main/java/androidx/ui/framework/demos/PopupActivity.kt b/ui/ui-framework/integration-tests/framework-demos/src/main/java/androidx/ui/framework/demos/PopupActivity.kt
index bb61ba5..35c5975 100644
--- a/ui/ui-framework/integration-tests/framework-demos/src/main/java/androidx/ui/framework/demos/PopupActivity.kt
+++ b/ui/ui-framework/integration-tests/framework-demos/src/main/java/androidx/ui/framework/demos/PopupActivity.kt

@@ -41,22 +41,22 @@
 import androidx.ui.foundation.shape.RectangleShape
 import androidx.ui.foundation.shape.corner.CircleShape
 import androidx.ui.graphics.Color
+import androidx.ui.graphics.Paint
 import androidx.ui.input.ImeAction
 import androidx.ui.input.KeyboardType
 import androidx.ui.layout.Column
+import androidx.ui.layout.ColumnScope
 import androidx.ui.layout.Container
 import androidx.ui.layout.DpConstraints
 import androidx.ui.layout.EdgeInsets
 import androidx.ui.layout.FlexRow
-import androidx.ui.layout.Height
-import androidx.ui.layout.Spacer
+import androidx.ui.layout.LayoutExpandedHeight
+import androidx.ui.layout.LayoutExpandedWidth
+import androidx.ui.layout.LayoutGravity
+import androidx.ui.layout.LayoutHeight
 import androidx.ui.layout.MainAxisAlignment
+import androidx.ui.layout.Spacer
 import androidx.ui.layout.Wrap
-import androidx.ui.graphics.Paint
-import androidx.ui.layout.ColumnScope
-import androidx.ui.layout.ExpandedHeight
-import androidx.ui.layout.ExpandedWidth
-import androidx.ui.layout.Gravity
 import androidx.ui.text.TextStyle
 import androidx.ui.text.style.TextAlign
 
@@ -70,7 +70,7 @@
 
             Column {
                 FlexRow(
-                    ExpandedWidth wraps Gravity.Center,
+                    LayoutExpandedWidth wraps LayoutGravity.Center,
                     mainAxisAlignment = MainAxisAlignment.SpaceBetween
                 ) {
                     inflexible {
@@ -161,7 +161,7 @@
     val showPopup = +state { true }
     val containerSize = 100.dp
 
-    Column(Gravity.Center) {
+    Column(LayoutGravity.Center) {
         Container(width = containerSize, height = containerSize) {
             if (showPopup.value) {
                 Popup(alignment = Alignment.Center) {
@@ -190,7 +190,7 @@
 
 @Composable
 fun ColumnScope.PopupWithChangingContent() {
-    Column(Gravity.Center) {
+    Column(LayoutGravity.Center) {
             val heightSize = 120.dp
             val widthSize = 160.dp
             val popupContentState = +state { 0 }
@@ -221,7 +221,7 @@
                 }
             }
 
-            Spacer(Height(10.dp))
+            Spacer(LayoutHeight(10.dp))
             ClickableTextWithBackground(
                 text = "Change content",
                 color = Color.Cyan,
@@ -241,7 +241,7 @@
     val parentHeight = +state { 60.dp }
     val parentSizeChanged = +state { false }
 
-    Column(Gravity.Center) {
+    Column(LayoutGravity.Center) {
         Container(
             height = containerHeight,
             width = containerWidth,
@@ -259,7 +259,7 @@
                 }
             }
         }
-        Spacer(Height(10.dp))
+        Spacer(LayoutHeight(10.dp))
         ClickableTextWithBackground(
             text = "Change parent's position",
             color = Color.Cyan,
@@ -271,7 +271,7 @@
                         Alignment.TopLeft
             }
         )
-        Spacer(Height(10.dp))
+        Spacer(LayoutHeight(10.dp))
         ClickableTextWithBackground(
             text = "Change parent's size",
             color = Color.Cyan,
@@ -291,7 +291,7 @@
 
 @Composable
 fun ColumnScope.PopupDropdownAlignment() {
-    Column(Gravity.Center) {
+    Column(LayoutGravity.Center) {
             val heightSize = 120.dp
             val widthSize = 160.dp
             val dropDownAlignment = +state { DropDownAlignment.Left }
@@ -308,7 +308,7 @@
                 }
             )
 
-            Spacer(Height(10.dp))
+            Spacer(LayoutHeight(10.dp))
 
             ColoredContainer(
                 height = heightSize,
@@ -330,7 +330,7 @@
 
 @Composable
 fun ColumnScope.PopupAlignmentDemo() {
-    Container(Gravity.Center) {
+    Container(LayoutGravity.Center) {
         val heightSize = 200.dp
         val widthSize = 400.dp
         val counter = +state { 0 }
@@ -365,8 +365,8 @@
                 }
             }
 
-            Spacer(Height(10.dp))
-            ColoredContainer(color = Color.White, modifier = Gravity.Center) {
+            Spacer(LayoutHeight(10.dp))
+            ColoredContainer(color = Color.White, modifier = LayoutGravity.Center) {
                 Text("Alignment: " + popupAlignment.value.toString())
             }
         }
@@ -375,7 +375,7 @@
 
 @Composable
 fun ColumnScope.PopupWithEditText() {
-    Column(Gravity.Center) {
+    Column(LayoutGravity.Center) {
             val widthSize = 190.dp
             val heightSize = 120.dp
             val editLineSize = 150.dp
@@ -391,7 +391,7 @@
                 height = heightSize,
                 width = widthSize,
                 color = Color.Red,
-                modifier = Gravity.Center
+                modifier = LayoutGravity.Center
             ) {
                 if (showPopup.value) {
                     Popup(
@@ -421,13 +421,13 @@
 
 @Composable
 fun ColumnScope.PopupWithChangingSize() {
-    Column(Gravity.Center) {
+    Column(LayoutGravity.Center) {
             val showPopup = +state { true }
             val heightSize = 120.dp
             val widthSize = 160.dp
             val rectangleState = +state { 0 }
 
-            Spacer(Height(15.dp))
+            Spacer(LayoutHeight(15.dp))
             ColoredContainer(
                 height = heightSize,
                 width = widthSize,
@@ -460,7 +460,7 @@
                     }
                 }
             }
-            Spacer(Height(25.dp))
+            Spacer(LayoutHeight(25.dp))
             ClickableTextWithBackground(
                 text = "Change size",
                 color = Color.Cyan,
@@ -475,9 +475,9 @@
 fun ColumnScope.PopupInsideScroller() {
     val heightSize = 400.dp
     val widthSize = 200.dp
-    Container(width = widthSize, height = heightSize, modifier = Gravity.Center) {
+    Container(width = widthSize, height = heightSize, modifier = LayoutGravity.Center) {
         VerticalScroller {
-            Column(ExpandedHeight) {
+            Column(LayoutExpandedHeight) {
                 ColoredContainer(width = 80.dp,
                     height = 160.dp,
                     color = Color(0xFF00FF00)
@@ -488,7 +488,7 @@
                 }
 
                 for (i in 0..30) {
-                    Text(text = "Scroll #$i", modifier = Gravity.Center)
+                    Text(text = "Scroll #$i", modifier = LayoutGravity.Center)
                 }
             }
         }
@@ -501,13 +501,13 @@
         val widthSize = 190.dp
         val heightSize = 120.dp
 
-        Spacer(Height(350.dp))
+        Spacer(LayoutHeight(350.dp))
         Text("Start typing in the EditText below the parent(Red rectangle)")
         ColoredContainer(
             height = heightSize,
             width = widthSize,
             color = Color.Red,
-            modifier = Gravity.Center
+            modifier = LayoutGravity.Center
         ) {
             Popup(Alignment.Center) {
                 ColoredContainer(color = Color.Green) {
@@ -518,7 +518,7 @@
 
         EditLine(initialText = "Continue typing...", color = Color.Gray)
 
-        Spacer(Height(24.dp))
+        Spacer(LayoutHeight(24.dp))
     }
 }
 
@@ -529,7 +529,7 @@
     onClick: (() -> Unit)? = null,
     padding: EdgeInsets = EdgeInsets(0.dp)
 ) {
-    Container(Gravity.Center) {
+    Container(LayoutGravity.Center) {
         DrawShape(RectangleShape, color)
         Clickable( {
             Container(padding = padding) {

diff --git a/ui/ui-framework/integration-tests/framework-demos/src/main/java/androidx/ui/framework/demos/SemanticsL1.kt b/ui/ui-framework/integration-tests/framework-demos/src/main/java/androidx/ui/framework/demos/SemanticsL1.kt
index 89ab354..4f6baea 100644
--- a/ui/ui-framework/integration-tests/framework-demos/src/main/java/androidx/ui/framework/demos/SemanticsL1.kt
+++ b/ui/ui-framework/integration-tests/framework-demos/src/main/java/androidx/ui/framework/demos/SemanticsL1.kt

@@ -30,9 +30,9 @@
 import androidx.compose.state
 import androidx.compose.unaryPlus
 import androidx.ui.layout.Arrangement
-import androidx.ui.layout.ExpandedHeight
-import androidx.ui.layout.ExpandedWidth
-import androidx.ui.layout.Gravity
+import androidx.ui.layout.LayoutExpandedHeight
+import androidx.ui.layout.LayoutExpandedWidth
+import androidx.ui.layout.LayoutGravity
 
 /** A [SemanticProperty] is used to store semantic information about a component.
  *
@@ -165,7 +165,7 @@
     actions: Set<SemanticAction<out Any?>> = setOf(),
     children: @Composable() () -> Unit
 ) {
-    Column(ExpandedHeight) {
+    Column(LayoutExpandedHeight) {
         MaterialTheme {
             Collapsable {
                 InvokeActionsByType(actions)
@@ -174,11 +174,11 @@
                 InvokeActionsByParameters(actions)
             }
         }
-        Row(ExpandedWidth, arrangement = Arrangement.Center) {
+        Row(LayoutExpandedWidth, arrangement = Arrangement.Center) {
             Container(
                 height = 300.dp,
                 width = 500.dp,
-                modifier = Gravity.Center,
+                modifier = LayoutGravity.Center,
                 children = children
             )
         }
@@ -194,7 +194,7 @@
     val secondary =
         actions.firstOrNull { it.types.contains(AccessibilityAction.Secondary) }
     Text(text = "Accessibility Actions By Type", style = (+MaterialTheme.typography()).h6)
-    Row(ExpandedWidth, arrangement = Arrangement.SpaceEvenly) {
+    Row(LayoutExpandedWidth, arrangement = Arrangement.SpaceEvenly) {
         Button(
             text = "Primary",
              primary?.invoke(ActionCaller.Accessibility) })
@@ -212,7 +212,7 @@
     Text(
         text = "Accessibility Actions By Phrase",
         style = (+MaterialTheme.typography()).h6)
-    Row(ExpandedWidth, arrangement = Arrangement.SpaceEvenly) {
+    Row(LayoutExpandedWidth, arrangement = Arrangement.SpaceEvenly) {
         actions.forEach {
             Button(
                 text = it.phrase,
@@ -229,7 +229,7 @@
     val positive = actions.firstOrNull { it.types.contains(PolarityAction.Positive) }
     val negative = actions.firstOrNull { it.types.contains(PolarityAction.Negative) }
     Text(text = "Assistant Actions", style = (+MaterialTheme.typography()).h6)
-    Row(ExpandedWidth, arrangement = Arrangement.SpaceEvenly) {
+    Row(LayoutExpandedWidth, arrangement = Arrangement.SpaceEvenly) {
         Button(
             text = "Negative",
              negative?.invoke(ActionCaller.Assistant) })
@@ -253,7 +253,7 @@
     val unitAction =
         actions.firstOrNull { it.defaultParam is Unit } as SemanticAction<Unit>?
     Text(text = "Actions using Parameters", style = (+MaterialTheme.typography()).h6)
-    Row(ExpandedWidth, arrangement = Arrangement.SpaceEvenly) {
+    Row(LayoutExpandedWidth, arrangement = Arrangement.SpaceEvenly) {
         Button(
             text = "IntAction",
              pxPositionAction?.invoke(param = PxPosition(1.px, 1.px)) })
@@ -277,7 +277,7 @@
 
     val collapsedState = +state { CollapseMode.Collapsed }
 
-    Row(ExpandedWidth, arrangement = Arrangement.SpaceEvenly) {
+    Row(LayoutExpandedWidth, arrangement = Arrangement.SpaceEvenly) {
         Button(text = "Show/Hide Actions", >
             collapsedState.value = when (collapsedState.value) {
                 CollapseMode.Collapsed -> CollapseMode.Visible

diff --git a/ui/ui-framework/integration-tests/framework-demos/src/main/java/androidx/ui/framework/demos/autofill/ExplicitAutofillTypesActivity.kt b/ui/ui-framework/integration-tests/framework-demos/src/main/java/androidx/ui/framework/demos/autofill/ExplicitAutofillTypesActivity.kt
index ddbaf52..24deccd 100644
--- a/ui/ui-framework/integration-tests/framework-demos/src/main/java/androidx/ui/framework/demos/autofill/ExplicitAutofillTypesActivity.kt
+++ b/ui/ui-framework/integration-tests/framework-demos/src/main/java/androidx/ui/framework/demos/autofill/ExplicitAutofillTypesActivity.kt

@@ -37,7 +37,7 @@
 import androidx.ui.input.ImeAction
 import androidx.ui.input.KeyboardType
 import androidx.ui.layout.Column
-import androidx.ui.layout.Height
+import androidx.ui.layout.LayoutHeight
 import androidx.ui.layout.Spacer
 import androidx.ui.material.MaterialTheme
 
@@ -71,7 +71,7 @@
                         )
                     }
 
-                    Spacer(Height(40.dp))
+                    Spacer(LayoutHeight(40.dp))
 
                     Text("Email", style = labelStyle)
                     Autofill(

diff --git a/ui/ui-framework/integration-tests/framework-demos/src/main/java/androidx/ui/framework/demos/focus/FocusableActivity.kt b/ui/ui-framework/integration-tests/framework-demos/src/main/java/androidx/ui/framework/demos/focus/FocusableActivity.kt
index 8f217ae..bf5cc05 100644
--- a/ui/ui-framework/integration-tests/framework-demos/src/main/java/androidx/ui/framework/demos/focus/FocusableActivity.kt
+++ b/ui/ui-framework/integration-tests/framework-demos/src/main/java/androidx/ui/framework/demos/focus/FocusableActivity.kt

@@ -29,7 +29,7 @@
 import androidx.ui.graphics.Color
 import androidx.ui.layout.Arrangement
 import androidx.ui.layout.Column
-import androidx.ui.layout.ExpandedWidth
+import androidx.ui.layout.LayoutExpandedWidth
 import androidx.ui.layout.Row
 import androidx.ui.layout.RowScope
 import androidx.ui.material.MaterialTheme
@@ -81,5 +81,5 @@
 
 @Composable
 private fun CenteredRow(children: @Composable() RowScope.() -> Unit) {
-    Row(modifier = ExpandedWidth, arrangement = Arrangement.Center, children = children)
+    Row(modifier = LayoutExpandedWidth, arrangement = Arrangement.Center, children = children)
 }
\ No newline at end of file

diff --git a/ui/ui-layout/api/0.1.0-dev04.txt b/ui/ui-layout/api/0.1.0-dev04.txt
index f0f5759..312c8ea 100644
--- a/ui/ui-layout/api/0.1.0-dev04.txt
+++ b/ui/ui-layout/api/0.1.0-dev04.txt

@@ -7,40 +7,6 @@
     method public static void Center(kotlin.jvm.functions.Function0<kotlin.Unit> children);
   }
 
-  public final class Aligned {
-    method public androidx.ui.core.LayoutModifier getBottom();
-    method public androidx.ui.core.LayoutModifier getBottomCenter();
-    method public androidx.ui.core.LayoutModifier getBottomLeft();
-    method public androidx.ui.core.LayoutModifier getBottomRight();
-    method public androidx.ui.core.LayoutModifier getCenter();
-    method public androidx.ui.core.LayoutModifier getCenterHorizontally();
-    method public androidx.ui.core.LayoutModifier getCenterLeft();
-    method public androidx.ui.core.LayoutModifier getCenterRight();
-    method public androidx.ui.core.LayoutModifier getCenterVertically();
-    method public androidx.ui.core.LayoutModifier getEnd();
-    method public androidx.ui.core.LayoutModifier getStart();
-    method public androidx.ui.core.LayoutModifier getTop();
-    method public androidx.ui.core.LayoutModifier getTopCenter();
-    method public androidx.ui.core.LayoutModifier getTopLeft();
-    method public androidx.ui.core.LayoutModifier getTopRight();
-    property public final androidx.ui.core.LayoutModifier Bottom;
-    property public final androidx.ui.core.LayoutModifier BottomCenter;
-    property public final androidx.ui.core.LayoutModifier BottomLeft;
-    property public final androidx.ui.core.LayoutModifier BottomRight;
-    property public final androidx.ui.core.LayoutModifier Center;
-    property public final androidx.ui.core.LayoutModifier CenterHorizontally;
-    property public final androidx.ui.core.LayoutModifier CenterLeft;
-    property public final androidx.ui.core.LayoutModifier CenterRight;
-    property public final androidx.ui.core.LayoutModifier CenterVertically;
-    property public final androidx.ui.core.LayoutModifier End;
-    property public final androidx.ui.core.LayoutModifier Start;
-    property public final androidx.ui.core.LayoutModifier Top;
-    property public final androidx.ui.core.LayoutModifier TopCenter;
-    property public final androidx.ui.core.LayoutModifier TopLeft;
-    property public final androidx.ui.core.LayoutModifier TopRight;
-    field public static final androidx.ui.layout.Aligned! INSTANCE;
-  }
-
   public final class AlignmentLineKt {
     ctor public AlignmentLineKt();
     method public static void AlignmentLineOffset(androidx.ui.core.AlignmentLine alignmentLine, androidx.ui.core.Dp before = 0.dp, androidx.ui.core.Dp after = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
@@ -69,15 +35,14 @@
 
   public final class AspectRatioKt {
     ctor public AspectRatioKt();
-    method public static androidx.ui.core.LayoutModifier AspectRatio(@FloatRange(from=0.0, fromInclusive=false) float value);
     method @Deprecated public static void AspectRatio(float aspectRatio, kotlin.jvm.functions.Function0<kotlin.Unit> children);
   }
 
   public final class ColumnScope extends androidx.ui.layout.FlexScope {
-    method public androidx.ui.core.LayoutModifier RelativeToSiblings(androidx.ui.layout.Gravity, androidx.ui.core.VerticalAlignmentLine alignmentLine);
-    method public androidx.ui.core.LayoutModifier getCenter(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getEnd(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getStart(androidx.ui.layout.Gravity);
+    method public androidx.ui.core.LayoutModifier RelativeToSiblings(androidx.ui.layout.LayoutGravity, androidx.ui.core.VerticalAlignmentLine alignmentLine);
+    method public androidx.ui.core.LayoutModifier getCenter(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getEnd(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getStart(androidx.ui.layout.LayoutGravity);
     property public final androidx.ui.core.LayoutModifier Center;
     property public final androidx.ui.core.LayoutModifier End;
     property public final androidx.ui.core.LayoutModifier Start;
@@ -167,9 +132,9 @@
 
   public final class ExpandedModifierKt {
     ctor public ExpandedModifierKt();
-    method public static androidx.ui.core.LayoutModifier getExpanded();
-    method public static androidx.ui.core.LayoutModifier getExpandedHeight();
-    method public static androidx.ui.core.LayoutModifier getExpandedWidth();
+    method public static androidx.ui.core.LayoutModifier getLayoutExpanded();
+    method public static androidx.ui.core.LayoutModifier getLayoutExpandedHeight();
+    method public static androidx.ui.core.LayoutModifier getLayoutExpandedWidth();
   }
 
   public final class FlexChildren {
@@ -187,10 +152,10 @@
   }
 
   @androidx.ui.layout.LayoutScopeMarker public abstract sealed class FlexScope {
-    method public final androidx.ui.core.LayoutModifier Flexible(@FloatRange(from=0.0, fromInclusive=false) float flex, boolean tight = true);
-    method public final androidx.ui.core.LayoutModifier RelativeToSiblings(androidx.ui.layout.Gravity, kotlin.jvm.functions.Function1<? super androidx.ui.core.Placeable,androidx.ui.core.IntPx> alignmentLineBlock);
-    method public final androidx.ui.core.LayoutModifier getInflexible();
-    property public final androidx.ui.core.LayoutModifier Inflexible;
+    method public final androidx.ui.core.LayoutModifier LayoutFlexible(@FloatRange(from=0.0, fromInclusive=false) float flex, boolean tight = true);
+    method public final androidx.ui.core.LayoutModifier RelativeToSiblings(androidx.ui.layout.LayoutGravity, kotlin.jvm.functions.Function1<? super androidx.ui.core.Placeable,androidx.ui.core.IntPx> alignmentLineBlock);
+    method public final androidx.ui.core.LayoutModifier getLayoutInflexible();
+    property public final androidx.ui.core.LayoutModifier LayoutInflexible;
   }
 
   public enum FlowCrossAxisAlignment {
@@ -205,10 +170,6 @@
     method public static void FlowRow(androidx.ui.layout.LayoutSize mainAxisSize = androidx.ui.layout.LayoutSize.Wrap, androidx.ui.layout.MainAxisAlignment mainAxisAlignment = androidx.ui.layout.MainAxisAlignment.Start, androidx.ui.core.Dp mainAxisSpacing = 0.dp, androidx.ui.layout.FlowCrossAxisAlignment crossAxisAlignment = androidx.ui.layout.FlowCrossAxisAlignment.Start, androidx.ui.core.Dp crossAxisSpacing = 0.dp, androidx.ui.layout.MainAxisAlignment lastLineMainAxisAlignment = mainAxisAlignment, kotlin.jvm.functions.Function0<kotlin.Unit> children);
   }
 
-  public final class Gravity {
-    field public static final androidx.ui.layout.Gravity! INSTANCE;
-  }
-
   public final class IntrinsicKt {
     ctor public IntrinsicKt();
     method public static void MaxIntrinsicHeight(kotlin.jvm.functions.Function0<kotlin.Unit> children);
@@ -217,6 +178,73 @@
     method public static void MinIntrinsicWidth(kotlin.jvm.functions.Function0<kotlin.Unit> children);
   }
 
+  public final class LayoutAlign {
+    method public androidx.ui.core.LayoutModifier getBottom();
+    method public androidx.ui.core.LayoutModifier getBottomCenter();
+    method public androidx.ui.core.LayoutModifier getBottomLeft();
+    method public androidx.ui.core.LayoutModifier getBottomRight();
+    method public androidx.ui.core.LayoutModifier getCenter();
+    method public androidx.ui.core.LayoutModifier getCenterHorizontally();
+    method public androidx.ui.core.LayoutModifier getCenterLeft();
+    method public androidx.ui.core.LayoutModifier getCenterRight();
+    method public androidx.ui.core.LayoutModifier getCenterVertically();
+    method public androidx.ui.core.LayoutModifier getEnd();
+    method public androidx.ui.core.LayoutModifier getStart();
+    method public androidx.ui.core.LayoutModifier getTop();
+    method public androidx.ui.core.LayoutModifier getTopCenter();
+    method public androidx.ui.core.LayoutModifier getTopLeft();
+    method public androidx.ui.core.LayoutModifier getTopRight();
+    property public final androidx.ui.core.LayoutModifier Bottom;
+    property public final androidx.ui.core.LayoutModifier BottomCenter;
+    property public final androidx.ui.core.LayoutModifier BottomLeft;
+    property public final androidx.ui.core.LayoutModifier BottomRight;
+    property public final androidx.ui.core.LayoutModifier Center;
+    property public final androidx.ui.core.LayoutModifier CenterHorizontally;
+    property public final androidx.ui.core.LayoutModifier CenterLeft;
+    property public final androidx.ui.core.LayoutModifier CenterRight;
+    property public final androidx.ui.core.LayoutModifier CenterVertically;
+    property public final androidx.ui.core.LayoutModifier End;
+    property public final androidx.ui.core.LayoutModifier Start;
+    property public final androidx.ui.core.LayoutModifier Top;
+    property public final androidx.ui.core.LayoutModifier TopCenter;
+    property public final androidx.ui.core.LayoutModifier TopLeft;
+    property public final androidx.ui.core.LayoutModifier TopRight;
+    field public static final androidx.ui.layout.LayoutAlign! INSTANCE;
+  }
+
+  public final class LayoutAspectRatio implements androidx.ui.core.LayoutModifier {
+    ctor public LayoutAspectRatio(@FloatRange(from=null, fromInclusive=null) float aspectRatio);
+    method public float component1();
+    method public androidx.ui.layout.LayoutAspectRatio copy(float aspectRatio);
+    method public float getAspectRatio();
+    method public androidx.ui.core.IntPx maxIntrinsicHeightOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx width);
+    method public androidx.ui.core.IntPx maxIntrinsicWidthOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx height);
+    method public androidx.ui.core.IntPx minIntrinsicHeightOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx width);
+    method public androidx.ui.core.IntPx minIntrinsicWidthOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx height);
+    method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
+  }
+
+  public final class LayoutGravity {
+    field public static final androidx.ui.layout.LayoutGravity! INSTANCE;
+  }
+
+  public final class LayoutPadding implements androidx.ui.core.LayoutModifier {
+    ctor public LayoutPadding(androidx.ui.core.Dp left, androidx.ui.core.Dp top, androidx.ui.core.Dp right, androidx.ui.core.Dp bottom);
+    ctor public LayoutPadding();
+    method public androidx.ui.core.Dp component1();
+    method public androidx.ui.core.Dp component2();
+    method public androidx.ui.core.Dp component3();
+    method public androidx.ui.core.Dp component4();
+    method public androidx.ui.layout.LayoutPadding copy(androidx.ui.core.Dp left, androidx.ui.core.Dp top, androidx.ui.core.Dp right, androidx.ui.core.Dp bottom);
+    method public androidx.ui.core.Dp getBottom();
+    method public androidx.ui.core.Dp getLeft();
+    method public androidx.ui.core.Dp getRight();
+    method public androidx.ui.core.Dp getTop();
+    method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
+    method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
+    method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+  }
+
   @kotlin.DslMarker public @interface LayoutScopeMarker {
   }
 
@@ -234,11 +262,21 @@
     enum_constant public static final androidx.ui.layout.MainAxisAlignment Start;
   }
 
+  public final class PaddingKt {
+    ctor public PaddingKt();
+    method public static androidx.ui.layout.LayoutPadding LayoutPadding(androidx.ui.core.Dp all);
+    method public static void Padding(androidx.ui.layout.EdgeInsets padding, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static void Padding(androidx.ui.core.Dp left = 0.dp, androidx.ui.core.Dp top = 0.dp, androidx.ui.core.Dp right = 0.dp, androidx.ui.core.Dp bottom = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static void Padding(androidx.ui.core.Dp padding, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method @Deprecated public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.core.Dp left = 0.dp, androidx.ui.core.Dp top = 0.dp, androidx.ui.core.Dp right = 0.dp, androidx.ui.core.Dp bottom = 0.dp);
+    method @Deprecated public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.core.Dp all = 0.dp);
+  }
+
   public final class RowScope extends androidx.ui.layout.FlexScope {
-    method public androidx.ui.core.LayoutModifier RelativeToSiblings(androidx.ui.layout.Gravity, androidx.ui.core.HorizontalAlignmentLine alignmentLine);
-    method public androidx.ui.core.LayoutModifier getBottom(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getCenter(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getTop(androidx.ui.layout.Gravity);
+    method public androidx.ui.core.LayoutModifier RelativeToSiblings(androidx.ui.layout.LayoutGravity, androidx.ui.core.HorizontalAlignmentLine alignmentLine);
+    method public androidx.ui.core.LayoutModifier getBottom(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getCenter(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getTop(androidx.ui.layout.LayoutGravity);
     property public final androidx.ui.core.LayoutModifier Bottom;
     property public final androidx.ui.core.LayoutModifier Center;
     property public final androidx.ui.core.LayoutModifier Top;
@@ -246,15 +284,15 @@
 
   public final class SizeModifiersKt {
     ctor public SizeModifiersKt();
-    method public static androidx.ui.core.LayoutModifier Height(androidx.ui.core.Dp value);
-    method public static androidx.ui.core.LayoutModifier MaxHeight(androidx.ui.core.Dp value);
-    method public static androidx.ui.core.LayoutModifier MaxSize(androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp maxHeight);
-    method public static androidx.ui.core.LayoutModifier MaxWidth(androidx.ui.core.Dp value);
-    method public static androidx.ui.core.LayoutModifier MinHeight(androidx.ui.core.Dp value);
-    method public static androidx.ui.core.LayoutModifier MinSize(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp minHeight);
-    method public static androidx.ui.core.LayoutModifier MinWidth(androidx.ui.core.Dp value);
-    method public static androidx.ui.core.LayoutModifier Size(androidx.ui.core.Dp width, androidx.ui.core.Dp height);
-    method public static androidx.ui.core.LayoutModifier Width(androidx.ui.core.Dp value);
+    method public static androidx.ui.core.LayoutModifier LayoutHeight(androidx.ui.core.Dp value);
+    method public static androidx.ui.core.LayoutModifier LayoutMaxHeight(androidx.ui.core.Dp value);
+    method public static androidx.ui.core.LayoutModifier LayoutMaxSize(androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp maxHeight);
+    method public static androidx.ui.core.LayoutModifier LayoutMaxWidth(androidx.ui.core.Dp value);
+    method public static androidx.ui.core.LayoutModifier LayoutMinHeight(androidx.ui.core.Dp value);
+    method public static androidx.ui.core.LayoutModifier LayoutMinSize(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp minHeight);
+    method public static androidx.ui.core.LayoutModifier LayoutMinWidth(androidx.ui.core.Dp value);
+    method public static androidx.ui.core.LayoutModifier LayoutSize(androidx.ui.core.Dp width, androidx.ui.core.Dp height);
+    method public static androidx.ui.core.LayoutModifier LayoutWidth(androidx.ui.core.Dp value);
   }
 
   public final class SpacerKt {
@@ -262,15 +300,6 @@
     method public static void Spacer(androidx.ui.core.Modifier modifier);
   }
 
-  public final class SpacingKt {
-    ctor public SpacingKt();
-    method public static void Padding(androidx.ui.layout.EdgeInsets padding, kotlin.jvm.functions.Function0<kotlin.Unit> children);
-    method public static void Padding(androidx.ui.core.Dp left = 0.dp, androidx.ui.core.Dp top = 0.dp, androidx.ui.core.Dp right = 0.dp, androidx.ui.core.Dp bottom = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
-    method public static void Padding(androidx.ui.core.Dp padding, kotlin.jvm.functions.Function0<kotlin.Unit> children);
-    method public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.core.Dp left = 0.dp, androidx.ui.core.Dp top = 0.dp, androidx.ui.core.Dp right = 0.dp, androidx.ui.core.Dp bottom = 0.dp);
-    method public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.core.Dp all = 0.dp);
-  }
-
   public final class StackKt {
     ctor public StackKt();
     method public static void Stack(androidx.ui.core.Modifier modifier = Modifier.None, kotlin.jvm.functions.Function1<? super androidx.ui.layout.StackScope,kotlin.Unit> children);
@@ -278,16 +307,16 @@
 
   @androidx.ui.layout.LayoutScopeMarker public final class StackScope {
     ctor public StackScope();
-    method public androidx.ui.core.LayoutModifier getBottomCenter(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getBottomLeft(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getBottomRight(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getCenter(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getCenterLeft(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getCenterRight(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getStretch(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getTopCenter(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getTopLeft(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getTopRight(androidx.ui.layout.Gravity);
+    method public androidx.ui.core.LayoutModifier getBottomCenter(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getBottomLeft(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getBottomRight(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getCenter(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getCenterLeft(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getCenterRight(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getStretch(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getTopCenter(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getTopLeft(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getTopRight(androidx.ui.layout.LayoutGravity);
     property public final androidx.ui.core.LayoutModifier BottomCenter;
     property public final androidx.ui.core.LayoutModifier BottomLeft;
     property public final androidx.ui.core.LayoutModifier BottomRight;
@@ -387,7 +416,7 @@
   public final class WrapKt {
     ctor public WrapKt();
     method public static void Wrap(androidx.ui.core.Alignment alignment = Alignment.TopLeft, kotlin.jvm.functions.Function0<kotlin.Unit> children);
-    method public static androidx.ui.core.LayoutModifier getWrapped();
+    method public static androidx.ui.core.LayoutModifier getLayoutWrapped();
   }
 
 }

diff --git a/ui/ui-layout/api/current.txt b/ui/ui-layout/api/current.txt
index f0f5759..312c8ea 100644
--- a/ui/ui-layout/api/current.txt
+++ b/ui/ui-layout/api/current.txt

@@ -7,40 +7,6 @@
     method public static void Center(kotlin.jvm.functions.Function0<kotlin.Unit> children);
   }
 
-  public final class Aligned {
-    method public androidx.ui.core.LayoutModifier getBottom();
-    method public androidx.ui.core.LayoutModifier getBottomCenter();
-    method public androidx.ui.core.LayoutModifier getBottomLeft();
-    method public androidx.ui.core.LayoutModifier getBottomRight();
-    method public androidx.ui.core.LayoutModifier getCenter();
-    method public androidx.ui.core.LayoutModifier getCenterHorizontally();
-    method public androidx.ui.core.LayoutModifier getCenterLeft();
-    method public androidx.ui.core.LayoutModifier getCenterRight();
-    method public androidx.ui.core.LayoutModifier getCenterVertically();
-    method public androidx.ui.core.LayoutModifier getEnd();
-    method public androidx.ui.core.LayoutModifier getStart();
-    method public androidx.ui.core.LayoutModifier getTop();
-    method public androidx.ui.core.LayoutModifier getTopCenter();
-    method public androidx.ui.core.LayoutModifier getTopLeft();
-    method public androidx.ui.core.LayoutModifier getTopRight();
-    property public final androidx.ui.core.LayoutModifier Bottom;
-    property public final androidx.ui.core.LayoutModifier BottomCenter;
-    property public final androidx.ui.core.LayoutModifier BottomLeft;
-    property public final androidx.ui.core.LayoutModifier BottomRight;
-    property public final androidx.ui.core.LayoutModifier Center;
-    property public final androidx.ui.core.LayoutModifier CenterHorizontally;
-    property public final androidx.ui.core.LayoutModifier CenterLeft;
-    property public final androidx.ui.core.LayoutModifier CenterRight;
-    property public final androidx.ui.core.LayoutModifier CenterVertically;
-    property public final androidx.ui.core.LayoutModifier End;
-    property public final androidx.ui.core.LayoutModifier Start;
-    property public final androidx.ui.core.LayoutModifier Top;
-    property public final androidx.ui.core.LayoutModifier TopCenter;
-    property public final androidx.ui.core.LayoutModifier TopLeft;
-    property public final androidx.ui.core.LayoutModifier TopRight;
-    field public static final androidx.ui.layout.Aligned! INSTANCE;
-  }
-
   public final class AlignmentLineKt {
     ctor public AlignmentLineKt();
     method public static void AlignmentLineOffset(androidx.ui.core.AlignmentLine alignmentLine, androidx.ui.core.Dp before = 0.dp, androidx.ui.core.Dp after = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
@@ -69,15 +35,14 @@
 
   public final class AspectRatioKt {
     ctor public AspectRatioKt();
-    method public static androidx.ui.core.LayoutModifier AspectRatio(@FloatRange(from=0.0, fromInclusive=false) float value);
     method @Deprecated public static void AspectRatio(float aspectRatio, kotlin.jvm.functions.Function0<kotlin.Unit> children);
   }
 
   public final class ColumnScope extends androidx.ui.layout.FlexScope {
-    method public androidx.ui.core.LayoutModifier RelativeToSiblings(androidx.ui.layout.Gravity, androidx.ui.core.VerticalAlignmentLine alignmentLine);
-    method public androidx.ui.core.LayoutModifier getCenter(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getEnd(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getStart(androidx.ui.layout.Gravity);
+    method public androidx.ui.core.LayoutModifier RelativeToSiblings(androidx.ui.layout.LayoutGravity, androidx.ui.core.VerticalAlignmentLine alignmentLine);
+    method public androidx.ui.core.LayoutModifier getCenter(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getEnd(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getStart(androidx.ui.layout.LayoutGravity);
     property public final androidx.ui.core.LayoutModifier Center;
     property public final androidx.ui.core.LayoutModifier End;
     property public final androidx.ui.core.LayoutModifier Start;
@@ -167,9 +132,9 @@
 
   public final class ExpandedModifierKt {
     ctor public ExpandedModifierKt();
-    method public static androidx.ui.core.LayoutModifier getExpanded();
-    method public static androidx.ui.core.LayoutModifier getExpandedHeight();
-    method public static androidx.ui.core.LayoutModifier getExpandedWidth();
+    method public static androidx.ui.core.LayoutModifier getLayoutExpanded();
+    method public static androidx.ui.core.LayoutModifier getLayoutExpandedHeight();
+    method public static androidx.ui.core.LayoutModifier getLayoutExpandedWidth();
   }
 
   public final class FlexChildren {
@@ -187,10 +152,10 @@
   }
 
   @androidx.ui.layout.LayoutScopeMarker public abstract sealed class FlexScope {
-    method public final androidx.ui.core.LayoutModifier Flexible(@FloatRange(from=0.0, fromInclusive=false) float flex, boolean tight = true);
-    method public final androidx.ui.core.LayoutModifier RelativeToSiblings(androidx.ui.layout.Gravity, kotlin.jvm.functions.Function1<? super androidx.ui.core.Placeable,androidx.ui.core.IntPx> alignmentLineBlock);
-    method public final androidx.ui.core.LayoutModifier getInflexible();
-    property public final androidx.ui.core.LayoutModifier Inflexible;
+    method public final androidx.ui.core.LayoutModifier LayoutFlexible(@FloatRange(from=0.0, fromInclusive=false) float flex, boolean tight = true);
+    method public final androidx.ui.core.LayoutModifier RelativeToSiblings(androidx.ui.layout.LayoutGravity, kotlin.jvm.functions.Function1<? super androidx.ui.core.Placeable,androidx.ui.core.IntPx> alignmentLineBlock);
+    method public final androidx.ui.core.LayoutModifier getLayoutInflexible();
+    property public final androidx.ui.core.LayoutModifier LayoutInflexible;
   }
 
   public enum FlowCrossAxisAlignment {
@@ -205,10 +170,6 @@
     method public static void FlowRow(androidx.ui.layout.LayoutSize mainAxisSize = androidx.ui.layout.LayoutSize.Wrap, androidx.ui.layout.MainAxisAlignment mainAxisAlignment = androidx.ui.layout.MainAxisAlignment.Start, androidx.ui.core.Dp mainAxisSpacing = 0.dp, androidx.ui.layout.FlowCrossAxisAlignment crossAxisAlignment = androidx.ui.layout.FlowCrossAxisAlignment.Start, androidx.ui.core.Dp crossAxisSpacing = 0.dp, androidx.ui.layout.MainAxisAlignment lastLineMainAxisAlignment = mainAxisAlignment, kotlin.jvm.functions.Function0<kotlin.Unit> children);
   }
 
-  public final class Gravity {
-    field public static final androidx.ui.layout.Gravity! INSTANCE;
-  }
-
   public final class IntrinsicKt {
     ctor public IntrinsicKt();
     method public static void MaxIntrinsicHeight(kotlin.jvm.functions.Function0<kotlin.Unit> children);
@@ -217,6 +178,73 @@
     method public static void MinIntrinsicWidth(kotlin.jvm.functions.Function0<kotlin.Unit> children);
   }
 
+  public final class LayoutAlign {
+    method public androidx.ui.core.LayoutModifier getBottom();
+    method public androidx.ui.core.LayoutModifier getBottomCenter();
+    method public androidx.ui.core.LayoutModifier getBottomLeft();
+    method public androidx.ui.core.LayoutModifier getBottomRight();
+    method public androidx.ui.core.LayoutModifier getCenter();
+    method public androidx.ui.core.LayoutModifier getCenterHorizontally();
+    method public androidx.ui.core.LayoutModifier getCenterLeft();
+    method public androidx.ui.core.LayoutModifier getCenterRight();
+    method public androidx.ui.core.LayoutModifier getCenterVertically();
+    method public androidx.ui.core.LayoutModifier getEnd();
+    method public androidx.ui.core.LayoutModifier getStart();
+    method public androidx.ui.core.LayoutModifier getTop();
+    method public androidx.ui.core.LayoutModifier getTopCenter();
+    method public androidx.ui.core.LayoutModifier getTopLeft();
+    method public androidx.ui.core.LayoutModifier getTopRight();
+    property public final androidx.ui.core.LayoutModifier Bottom;
+    property public final androidx.ui.core.LayoutModifier BottomCenter;
+    property public final androidx.ui.core.LayoutModifier BottomLeft;
+    property public final androidx.ui.core.LayoutModifier BottomRight;
+    property public final androidx.ui.core.LayoutModifier Center;
+    property public final androidx.ui.core.LayoutModifier CenterHorizontally;
+    property public final androidx.ui.core.LayoutModifier CenterLeft;
+    property public final androidx.ui.core.LayoutModifier CenterRight;
+    property public final androidx.ui.core.LayoutModifier CenterVertically;
+    property public final androidx.ui.core.LayoutModifier End;
+    property public final androidx.ui.core.LayoutModifier Start;
+    property public final androidx.ui.core.LayoutModifier Top;
+    property public final androidx.ui.core.LayoutModifier TopCenter;
+    property public final androidx.ui.core.LayoutModifier TopLeft;
+    property public final androidx.ui.core.LayoutModifier TopRight;
+    field public static final androidx.ui.layout.LayoutAlign! INSTANCE;
+  }
+
+  public final class LayoutAspectRatio implements androidx.ui.core.LayoutModifier {
+    ctor public LayoutAspectRatio(@FloatRange(from=null, fromInclusive=null) float aspectRatio);
+    method public float component1();
+    method public androidx.ui.layout.LayoutAspectRatio copy(float aspectRatio);
+    method public float getAspectRatio();
+    method public androidx.ui.core.IntPx maxIntrinsicHeightOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx width);
+    method public androidx.ui.core.IntPx maxIntrinsicWidthOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx height);
+    method public androidx.ui.core.IntPx minIntrinsicHeightOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx width);
+    method public androidx.ui.core.IntPx minIntrinsicWidthOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx height);
+    method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
+  }
+
+  public final class LayoutGravity {
+    field public static final androidx.ui.layout.LayoutGravity! INSTANCE;
+  }
+
+  public final class LayoutPadding implements androidx.ui.core.LayoutModifier {
+    ctor public LayoutPadding(androidx.ui.core.Dp left, androidx.ui.core.Dp top, androidx.ui.core.Dp right, androidx.ui.core.Dp bottom);
+    ctor public LayoutPadding();
+    method public androidx.ui.core.Dp component1();
+    method public androidx.ui.core.Dp component2();
+    method public androidx.ui.core.Dp component3();
+    method public androidx.ui.core.Dp component4();
+    method public androidx.ui.layout.LayoutPadding copy(androidx.ui.core.Dp left, androidx.ui.core.Dp top, androidx.ui.core.Dp right, androidx.ui.core.Dp bottom);
+    method public androidx.ui.core.Dp getBottom();
+    method public androidx.ui.core.Dp getLeft();
+    method public androidx.ui.core.Dp getRight();
+    method public androidx.ui.core.Dp getTop();
+    method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
+    method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
+    method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+  }
+
   @kotlin.DslMarker public @interface LayoutScopeMarker {
   }
 
@@ -234,11 +262,21 @@
     enum_constant public static final androidx.ui.layout.MainAxisAlignment Start;
   }
 
+  public final class PaddingKt {
+    ctor public PaddingKt();
+    method public static androidx.ui.layout.LayoutPadding LayoutPadding(androidx.ui.core.Dp all);
+    method public static void Padding(androidx.ui.layout.EdgeInsets padding, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static void Padding(androidx.ui.core.Dp left = 0.dp, androidx.ui.core.Dp top = 0.dp, androidx.ui.core.Dp right = 0.dp, androidx.ui.core.Dp bottom = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static void Padding(androidx.ui.core.Dp padding, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method @Deprecated public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.core.Dp left = 0.dp, androidx.ui.core.Dp top = 0.dp, androidx.ui.core.Dp right = 0.dp, androidx.ui.core.Dp bottom = 0.dp);
+    method @Deprecated public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.core.Dp all = 0.dp);
+  }
+
   public final class RowScope extends androidx.ui.layout.FlexScope {
-    method public androidx.ui.core.LayoutModifier RelativeToSiblings(androidx.ui.layout.Gravity, androidx.ui.core.HorizontalAlignmentLine alignmentLine);
-    method public androidx.ui.core.LayoutModifier getBottom(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getCenter(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getTop(androidx.ui.layout.Gravity);
+    method public androidx.ui.core.LayoutModifier RelativeToSiblings(androidx.ui.layout.LayoutGravity, androidx.ui.core.HorizontalAlignmentLine alignmentLine);
+    method public androidx.ui.core.LayoutModifier getBottom(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getCenter(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getTop(androidx.ui.layout.LayoutGravity);
     property public final androidx.ui.core.LayoutModifier Bottom;
     property public final androidx.ui.core.LayoutModifier Center;
     property public final androidx.ui.core.LayoutModifier Top;
@@ -246,15 +284,15 @@
 
   public final class SizeModifiersKt {
     ctor public SizeModifiersKt();
-    method public static androidx.ui.core.LayoutModifier Height(androidx.ui.core.Dp value);
-    method public static androidx.ui.core.LayoutModifier MaxHeight(androidx.ui.core.Dp value);
-    method public static androidx.ui.core.LayoutModifier MaxSize(androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp maxHeight);
-    method public static androidx.ui.core.LayoutModifier MaxWidth(androidx.ui.core.Dp value);
-    method public static androidx.ui.core.LayoutModifier MinHeight(androidx.ui.core.Dp value);
-    method public static androidx.ui.core.LayoutModifier MinSize(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp minHeight);
-    method public static androidx.ui.core.LayoutModifier MinWidth(androidx.ui.core.Dp value);
-    method public static androidx.ui.core.LayoutModifier Size(androidx.ui.core.Dp width, androidx.ui.core.Dp height);
-    method public static androidx.ui.core.LayoutModifier Width(androidx.ui.core.Dp value);
+    method public static androidx.ui.core.LayoutModifier LayoutHeight(androidx.ui.core.Dp value);
+    method public static androidx.ui.core.LayoutModifier LayoutMaxHeight(androidx.ui.core.Dp value);
+    method public static androidx.ui.core.LayoutModifier LayoutMaxSize(androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp maxHeight);
+    method public static androidx.ui.core.LayoutModifier LayoutMaxWidth(androidx.ui.core.Dp value);
+    method public static androidx.ui.core.LayoutModifier LayoutMinHeight(androidx.ui.core.Dp value);
+    method public static androidx.ui.core.LayoutModifier LayoutMinSize(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp minHeight);
+    method public static androidx.ui.core.LayoutModifier LayoutMinWidth(androidx.ui.core.Dp value);
+    method public static androidx.ui.core.LayoutModifier LayoutSize(androidx.ui.core.Dp width, androidx.ui.core.Dp height);
+    method public static androidx.ui.core.LayoutModifier LayoutWidth(androidx.ui.core.Dp value);
   }
 
   public final class SpacerKt {
@@ -262,15 +300,6 @@
     method public static void Spacer(androidx.ui.core.Modifier modifier);
   }
 
-  public final class SpacingKt {
-    ctor public SpacingKt();
-    method public static void Padding(androidx.ui.layout.EdgeInsets padding, kotlin.jvm.functions.Function0<kotlin.Unit> children);
-    method public static void Padding(androidx.ui.core.Dp left = 0.dp, androidx.ui.core.Dp top = 0.dp, androidx.ui.core.Dp right = 0.dp, androidx.ui.core.Dp bottom = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
-    method public static void Padding(androidx.ui.core.Dp padding, kotlin.jvm.functions.Function0<kotlin.Unit> children);
-    method public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.core.Dp left = 0.dp, androidx.ui.core.Dp top = 0.dp, androidx.ui.core.Dp right = 0.dp, androidx.ui.core.Dp bottom = 0.dp);
-    method public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.core.Dp all = 0.dp);
-  }
-
   public final class StackKt {
     ctor public StackKt();
     method public static void Stack(androidx.ui.core.Modifier modifier = Modifier.None, kotlin.jvm.functions.Function1<? super androidx.ui.layout.StackScope,kotlin.Unit> children);
@@ -278,16 +307,16 @@
 
   @androidx.ui.layout.LayoutScopeMarker public final class StackScope {
     ctor public StackScope();
-    method public androidx.ui.core.LayoutModifier getBottomCenter(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getBottomLeft(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getBottomRight(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getCenter(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getCenterLeft(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getCenterRight(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getStretch(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getTopCenter(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getTopLeft(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getTopRight(androidx.ui.layout.Gravity);
+    method public androidx.ui.core.LayoutModifier getBottomCenter(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getBottomLeft(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getBottomRight(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getCenter(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getCenterLeft(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getCenterRight(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getStretch(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getTopCenter(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getTopLeft(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getTopRight(androidx.ui.layout.LayoutGravity);
     property public final androidx.ui.core.LayoutModifier BottomCenter;
     property public final androidx.ui.core.LayoutModifier BottomLeft;
     property public final androidx.ui.core.LayoutModifier BottomRight;
@@ -387,7 +416,7 @@
   public final class WrapKt {
     ctor public WrapKt();
     method public static void Wrap(androidx.ui.core.Alignment alignment = Alignment.TopLeft, kotlin.jvm.functions.Function0<kotlin.Unit> children);
-    method public static androidx.ui.core.LayoutModifier getWrapped();
+    method public static androidx.ui.core.LayoutModifier getLayoutWrapped();
   }
 
 }

diff --git a/ui/ui-layout/api/public_plus_experimental_0.1.0-dev04.txt b/ui/ui-layout/api/public_plus_experimental_0.1.0-dev04.txt
index f0f5759..312c8ea 100644
--- a/ui/ui-layout/api/public_plus_experimental_0.1.0-dev04.txt
+++ b/ui/ui-layout/api/public_plus_experimental_0.1.0-dev04.txt

@@ -7,40 +7,6 @@
     method public static void Center(kotlin.jvm.functions.Function0<kotlin.Unit> children);
   }
 
-  public final class Aligned {
-    method public androidx.ui.core.LayoutModifier getBottom();
-    method public androidx.ui.core.LayoutModifier getBottomCenter();
-    method public androidx.ui.core.LayoutModifier getBottomLeft();
-    method public androidx.ui.core.LayoutModifier getBottomRight();
-    method public androidx.ui.core.LayoutModifier getCenter();
-    method public androidx.ui.core.LayoutModifier getCenterHorizontally();
-    method public androidx.ui.core.LayoutModifier getCenterLeft();
-    method public androidx.ui.core.LayoutModifier getCenterRight();
-    method public androidx.ui.core.LayoutModifier getCenterVertically();
-    method public androidx.ui.core.LayoutModifier getEnd();
-    method public androidx.ui.core.LayoutModifier getStart();
-    method public androidx.ui.core.LayoutModifier getTop();
-    method public androidx.ui.core.LayoutModifier getTopCenter();
-    method public androidx.ui.core.LayoutModifier getTopLeft();
-    method public androidx.ui.core.LayoutModifier getTopRight();
-    property public final androidx.ui.core.LayoutModifier Bottom;
-    property public final androidx.ui.core.LayoutModifier BottomCenter;
-    property public final androidx.ui.core.LayoutModifier BottomLeft;
-    property public final androidx.ui.core.LayoutModifier BottomRight;
-    property public final androidx.ui.core.LayoutModifier Center;
-    property public final androidx.ui.core.LayoutModifier CenterHorizontally;
-    property public final androidx.ui.core.LayoutModifier CenterLeft;
-    property public final androidx.ui.core.LayoutModifier CenterRight;
-    property public final androidx.ui.core.LayoutModifier CenterVertically;
-    property public final androidx.ui.core.LayoutModifier End;
-    property public final androidx.ui.core.LayoutModifier Start;
-    property public final androidx.ui.core.LayoutModifier Top;
-    property public final androidx.ui.core.LayoutModifier TopCenter;
-    property public final androidx.ui.core.LayoutModifier TopLeft;
-    property public final androidx.ui.core.LayoutModifier TopRight;
-    field public static final androidx.ui.layout.Aligned! INSTANCE;
-  }
-
   public final class AlignmentLineKt {
     ctor public AlignmentLineKt();
     method public static void AlignmentLineOffset(androidx.ui.core.AlignmentLine alignmentLine, androidx.ui.core.Dp before = 0.dp, androidx.ui.core.Dp after = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
@@ -69,15 +35,14 @@
 
   public final class AspectRatioKt {
     ctor public AspectRatioKt();
-    method public static androidx.ui.core.LayoutModifier AspectRatio(@FloatRange(from=0.0, fromInclusive=false) float value);
     method @Deprecated public static void AspectRatio(float aspectRatio, kotlin.jvm.functions.Function0<kotlin.Unit> children);
   }
 
   public final class ColumnScope extends androidx.ui.layout.FlexScope {
-    method public androidx.ui.core.LayoutModifier RelativeToSiblings(androidx.ui.layout.Gravity, androidx.ui.core.VerticalAlignmentLine alignmentLine);
-    method public androidx.ui.core.LayoutModifier getCenter(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getEnd(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getStart(androidx.ui.layout.Gravity);
+    method public androidx.ui.core.LayoutModifier RelativeToSiblings(androidx.ui.layout.LayoutGravity, androidx.ui.core.VerticalAlignmentLine alignmentLine);
+    method public androidx.ui.core.LayoutModifier getCenter(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getEnd(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getStart(androidx.ui.layout.LayoutGravity);
     property public final androidx.ui.core.LayoutModifier Center;
     property public final androidx.ui.core.LayoutModifier End;
     property public final androidx.ui.core.LayoutModifier Start;
@@ -167,9 +132,9 @@
 
   public final class ExpandedModifierKt {
     ctor public ExpandedModifierKt();
-    method public static androidx.ui.core.LayoutModifier getExpanded();
-    method public static androidx.ui.core.LayoutModifier getExpandedHeight();
-    method public static androidx.ui.core.LayoutModifier getExpandedWidth();
+    method public static androidx.ui.core.LayoutModifier getLayoutExpanded();
+    method public static androidx.ui.core.LayoutModifier getLayoutExpandedHeight();
+    method public static androidx.ui.core.LayoutModifier getLayoutExpandedWidth();
   }
 
   public final class FlexChildren {
@@ -187,10 +152,10 @@
   }
 
   @androidx.ui.layout.LayoutScopeMarker public abstract sealed class FlexScope {
-    method public final androidx.ui.core.LayoutModifier Flexible(@FloatRange(from=0.0, fromInclusive=false) float flex, boolean tight = true);
-    method public final androidx.ui.core.LayoutModifier RelativeToSiblings(androidx.ui.layout.Gravity, kotlin.jvm.functions.Function1<? super androidx.ui.core.Placeable,androidx.ui.core.IntPx> alignmentLineBlock);
-    method public final androidx.ui.core.LayoutModifier getInflexible();
-    property public final androidx.ui.core.LayoutModifier Inflexible;
+    method public final androidx.ui.core.LayoutModifier LayoutFlexible(@FloatRange(from=0.0, fromInclusive=false) float flex, boolean tight = true);
+    method public final androidx.ui.core.LayoutModifier RelativeToSiblings(androidx.ui.layout.LayoutGravity, kotlin.jvm.functions.Function1<? super androidx.ui.core.Placeable,androidx.ui.core.IntPx> alignmentLineBlock);
+    method public final androidx.ui.core.LayoutModifier getLayoutInflexible();
+    property public final androidx.ui.core.LayoutModifier LayoutInflexible;
   }
 
   public enum FlowCrossAxisAlignment {
@@ -205,10 +170,6 @@
     method public static void FlowRow(androidx.ui.layout.LayoutSize mainAxisSize = androidx.ui.layout.LayoutSize.Wrap, androidx.ui.layout.MainAxisAlignment mainAxisAlignment = androidx.ui.layout.MainAxisAlignment.Start, androidx.ui.core.Dp mainAxisSpacing = 0.dp, androidx.ui.layout.FlowCrossAxisAlignment crossAxisAlignment = androidx.ui.layout.FlowCrossAxisAlignment.Start, androidx.ui.core.Dp crossAxisSpacing = 0.dp, androidx.ui.layout.MainAxisAlignment lastLineMainAxisAlignment = mainAxisAlignment, kotlin.jvm.functions.Function0<kotlin.Unit> children);
   }
 
-  public final class Gravity {
-    field public static final androidx.ui.layout.Gravity! INSTANCE;
-  }
-
   public final class IntrinsicKt {
     ctor public IntrinsicKt();
     method public static void MaxIntrinsicHeight(kotlin.jvm.functions.Function0<kotlin.Unit> children);
@@ -217,6 +178,73 @@
     method public static void MinIntrinsicWidth(kotlin.jvm.functions.Function0<kotlin.Unit> children);
   }
 
+  public final class LayoutAlign {
+    method public androidx.ui.core.LayoutModifier getBottom();
+    method public androidx.ui.core.LayoutModifier getBottomCenter();
+    method public androidx.ui.core.LayoutModifier getBottomLeft();
+    method public androidx.ui.core.LayoutModifier getBottomRight();
+    method public androidx.ui.core.LayoutModifier getCenter();
+    method public androidx.ui.core.LayoutModifier getCenterHorizontally();
+    method public androidx.ui.core.LayoutModifier getCenterLeft();
+    method public androidx.ui.core.LayoutModifier getCenterRight();
+    method public androidx.ui.core.LayoutModifier getCenterVertically();
+    method public androidx.ui.core.LayoutModifier getEnd();
+    method public androidx.ui.core.LayoutModifier getStart();
+    method public androidx.ui.core.LayoutModifier getTop();
+    method public androidx.ui.core.LayoutModifier getTopCenter();
+    method public androidx.ui.core.LayoutModifier getTopLeft();
+    method public androidx.ui.core.LayoutModifier getTopRight();
+    property public final androidx.ui.core.LayoutModifier Bottom;
+    property public final androidx.ui.core.LayoutModifier BottomCenter;
+    property public final androidx.ui.core.LayoutModifier BottomLeft;
+    property public final androidx.ui.core.LayoutModifier BottomRight;
+    property public final androidx.ui.core.LayoutModifier Center;
+    property public final androidx.ui.core.LayoutModifier CenterHorizontally;
+    property public final androidx.ui.core.LayoutModifier CenterLeft;
+    property public final androidx.ui.core.LayoutModifier CenterRight;
+    property public final androidx.ui.core.LayoutModifier CenterVertically;
+    property public final androidx.ui.core.LayoutModifier End;
+    property public final androidx.ui.core.LayoutModifier Start;
+    property public final androidx.ui.core.LayoutModifier Top;
+    property public final androidx.ui.core.LayoutModifier TopCenter;
+    property public final androidx.ui.core.LayoutModifier TopLeft;
+    property public final androidx.ui.core.LayoutModifier TopRight;
+    field public static final androidx.ui.layout.LayoutAlign! INSTANCE;
+  }
+
+  public final class LayoutAspectRatio implements androidx.ui.core.LayoutModifier {
+    ctor public LayoutAspectRatio(@FloatRange(from=null, fromInclusive=null) float aspectRatio);
+    method public float component1();
+    method public androidx.ui.layout.LayoutAspectRatio copy(float aspectRatio);
+    method public float getAspectRatio();
+    method public androidx.ui.core.IntPx maxIntrinsicHeightOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx width);
+    method public androidx.ui.core.IntPx maxIntrinsicWidthOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx height);
+    method public androidx.ui.core.IntPx minIntrinsicHeightOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx width);
+    method public androidx.ui.core.IntPx minIntrinsicWidthOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx height);
+    method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
+  }
+
+  public final class LayoutGravity {
+    field public static final androidx.ui.layout.LayoutGravity! INSTANCE;
+  }
+
+  public final class LayoutPadding implements androidx.ui.core.LayoutModifier {
+    ctor public LayoutPadding(androidx.ui.core.Dp left, androidx.ui.core.Dp top, androidx.ui.core.Dp right, androidx.ui.core.Dp bottom);
+    ctor public LayoutPadding();
+    method public androidx.ui.core.Dp component1();
+    method public androidx.ui.core.Dp component2();
+    method public androidx.ui.core.Dp component3();
+    method public androidx.ui.core.Dp component4();
+    method public androidx.ui.layout.LayoutPadding copy(androidx.ui.core.Dp left, androidx.ui.core.Dp top, androidx.ui.core.Dp right, androidx.ui.core.Dp bottom);
+    method public androidx.ui.core.Dp getBottom();
+    method public androidx.ui.core.Dp getLeft();
+    method public androidx.ui.core.Dp getRight();
+    method public androidx.ui.core.Dp getTop();
+    method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
+    method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
+    method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+  }
+
   @kotlin.DslMarker public @interface LayoutScopeMarker {
   }
 
@@ -234,11 +262,21 @@
     enum_constant public static final androidx.ui.layout.MainAxisAlignment Start;
   }
 
+  public final class PaddingKt {
+    ctor public PaddingKt();
+    method public static androidx.ui.layout.LayoutPadding LayoutPadding(androidx.ui.core.Dp all);
+    method public static void Padding(androidx.ui.layout.EdgeInsets padding, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static void Padding(androidx.ui.core.Dp left = 0.dp, androidx.ui.core.Dp top = 0.dp, androidx.ui.core.Dp right = 0.dp, androidx.ui.core.Dp bottom = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static void Padding(androidx.ui.core.Dp padding, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method @Deprecated public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.core.Dp left = 0.dp, androidx.ui.core.Dp top = 0.dp, androidx.ui.core.Dp right = 0.dp, androidx.ui.core.Dp bottom = 0.dp);
+    method @Deprecated public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.core.Dp all = 0.dp);
+  }
+
   public final class RowScope extends androidx.ui.layout.FlexScope {
-    method public androidx.ui.core.LayoutModifier RelativeToSiblings(androidx.ui.layout.Gravity, androidx.ui.core.HorizontalAlignmentLine alignmentLine);
-    method public androidx.ui.core.LayoutModifier getBottom(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getCenter(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getTop(androidx.ui.layout.Gravity);
+    method public androidx.ui.core.LayoutModifier RelativeToSiblings(androidx.ui.layout.LayoutGravity, androidx.ui.core.HorizontalAlignmentLine alignmentLine);
+    method public androidx.ui.core.LayoutModifier getBottom(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getCenter(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getTop(androidx.ui.layout.LayoutGravity);
     property public final androidx.ui.core.LayoutModifier Bottom;
     property public final androidx.ui.core.LayoutModifier Center;
     property public final androidx.ui.core.LayoutModifier Top;
@@ -246,15 +284,15 @@
 
   public final class SizeModifiersKt {
     ctor public SizeModifiersKt();
-    method public static androidx.ui.core.LayoutModifier Height(androidx.ui.core.Dp value);
-    method public static androidx.ui.core.LayoutModifier MaxHeight(androidx.ui.core.Dp value);
-    method public static androidx.ui.core.LayoutModifier MaxSize(androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp maxHeight);
-    method public static androidx.ui.core.LayoutModifier MaxWidth(androidx.ui.core.Dp value);
-    method public static androidx.ui.core.LayoutModifier MinHeight(androidx.ui.core.Dp value);
-    method public static androidx.ui.core.LayoutModifier MinSize(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp minHeight);
-    method public static androidx.ui.core.LayoutModifier MinWidth(androidx.ui.core.Dp value);
-    method public static androidx.ui.core.LayoutModifier Size(androidx.ui.core.Dp width, androidx.ui.core.Dp height);
-    method public static androidx.ui.core.LayoutModifier Width(androidx.ui.core.Dp value);
+    method public static androidx.ui.core.LayoutModifier LayoutHeight(androidx.ui.core.Dp value);
+    method public static androidx.ui.core.LayoutModifier LayoutMaxHeight(androidx.ui.core.Dp value);
+    method public static androidx.ui.core.LayoutModifier LayoutMaxSize(androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp maxHeight);
+    method public static androidx.ui.core.LayoutModifier LayoutMaxWidth(androidx.ui.core.Dp value);
+    method public static androidx.ui.core.LayoutModifier LayoutMinHeight(androidx.ui.core.Dp value);
+    method public static androidx.ui.core.LayoutModifier LayoutMinSize(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp minHeight);
+    method public static androidx.ui.core.LayoutModifier LayoutMinWidth(androidx.ui.core.Dp value);
+    method public static androidx.ui.core.LayoutModifier LayoutSize(androidx.ui.core.Dp width, androidx.ui.core.Dp height);
+    method public static androidx.ui.core.LayoutModifier LayoutWidth(androidx.ui.core.Dp value);
   }
 
   public final class SpacerKt {
@@ -262,15 +300,6 @@
     method public static void Spacer(androidx.ui.core.Modifier modifier);
   }
 
-  public final class SpacingKt {
-    ctor public SpacingKt();
-    method public static void Padding(androidx.ui.layout.EdgeInsets padding, kotlin.jvm.functions.Function0<kotlin.Unit> children);
-    method public static void Padding(androidx.ui.core.Dp left = 0.dp, androidx.ui.core.Dp top = 0.dp, androidx.ui.core.Dp right = 0.dp, androidx.ui.core.Dp bottom = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
-    method public static void Padding(androidx.ui.core.Dp padding, kotlin.jvm.functions.Function0<kotlin.Unit> children);
-    method public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.core.Dp left = 0.dp, androidx.ui.core.Dp top = 0.dp, androidx.ui.core.Dp right = 0.dp, androidx.ui.core.Dp bottom = 0.dp);
-    method public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.core.Dp all = 0.dp);
-  }
-
   public final class StackKt {
     ctor public StackKt();
     method public static void Stack(androidx.ui.core.Modifier modifier = Modifier.None, kotlin.jvm.functions.Function1<? super androidx.ui.layout.StackScope,kotlin.Unit> children);
@@ -278,16 +307,16 @@
 
   @androidx.ui.layout.LayoutScopeMarker public final class StackScope {
     ctor public StackScope();
-    method public androidx.ui.core.LayoutModifier getBottomCenter(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getBottomLeft(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getBottomRight(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getCenter(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getCenterLeft(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getCenterRight(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getStretch(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getTopCenter(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getTopLeft(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getTopRight(androidx.ui.layout.Gravity);
+    method public androidx.ui.core.LayoutModifier getBottomCenter(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getBottomLeft(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getBottomRight(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getCenter(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getCenterLeft(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getCenterRight(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getStretch(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getTopCenter(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getTopLeft(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getTopRight(androidx.ui.layout.LayoutGravity);
     property public final androidx.ui.core.LayoutModifier BottomCenter;
     property public final androidx.ui.core.LayoutModifier BottomLeft;
     property public final androidx.ui.core.LayoutModifier BottomRight;
@@ -387,7 +416,7 @@
   public final class WrapKt {
     ctor public WrapKt();
     method public static void Wrap(androidx.ui.core.Alignment alignment = Alignment.TopLeft, kotlin.jvm.functions.Function0<kotlin.Unit> children);
-    method public static androidx.ui.core.LayoutModifier getWrapped();
+    method public static androidx.ui.core.LayoutModifier getLayoutWrapped();
   }
 
 }

diff --git a/ui/ui-layout/api/public_plus_experimental_current.txt b/ui/ui-layout/api/public_plus_experimental_current.txt
index f0f5759..312c8ea 100644
--- a/ui/ui-layout/api/public_plus_experimental_current.txt
+++ b/ui/ui-layout/api/public_plus_experimental_current.txt

@@ -7,40 +7,6 @@
     method public static void Center(kotlin.jvm.functions.Function0<kotlin.Unit> children);
   }
 
-  public final class Aligned {
-    method public androidx.ui.core.LayoutModifier getBottom();
-    method public androidx.ui.core.LayoutModifier getBottomCenter();
-    method public androidx.ui.core.LayoutModifier getBottomLeft();
-    method public androidx.ui.core.LayoutModifier getBottomRight();
-    method public androidx.ui.core.LayoutModifier getCenter();
-    method public androidx.ui.core.LayoutModifier getCenterHorizontally();
-    method public androidx.ui.core.LayoutModifier getCenterLeft();
-    method public androidx.ui.core.LayoutModifier getCenterRight();
-    method public androidx.ui.core.LayoutModifier getCenterVertically();
-    method public androidx.ui.core.LayoutModifier getEnd();
-    method public androidx.ui.core.LayoutModifier getStart();
-    method public androidx.ui.core.LayoutModifier getTop();
-    method public androidx.ui.core.LayoutModifier getTopCenter();
-    method public androidx.ui.core.LayoutModifier getTopLeft();
-    method public androidx.ui.core.LayoutModifier getTopRight();
-    property public final androidx.ui.core.LayoutModifier Bottom;
-    property public final androidx.ui.core.LayoutModifier BottomCenter;
-    property public final androidx.ui.core.LayoutModifier BottomLeft;
-    property public final androidx.ui.core.LayoutModifier BottomRight;
-    property public final androidx.ui.core.LayoutModifier Center;
-    property public final androidx.ui.core.LayoutModifier CenterHorizontally;
-    property public final androidx.ui.core.LayoutModifier CenterLeft;
-    property public final androidx.ui.core.LayoutModifier CenterRight;
-    property public final androidx.ui.core.LayoutModifier CenterVertically;
-    property public final androidx.ui.core.LayoutModifier End;
-    property public final androidx.ui.core.LayoutModifier Start;
-    property public final androidx.ui.core.LayoutModifier Top;
-    property public final androidx.ui.core.LayoutModifier TopCenter;
-    property public final androidx.ui.core.LayoutModifier TopLeft;
-    property public final androidx.ui.core.LayoutModifier TopRight;
-    field public static final androidx.ui.layout.Aligned! INSTANCE;
-  }
-
   public final class AlignmentLineKt {
     ctor public AlignmentLineKt();
     method public static void AlignmentLineOffset(androidx.ui.core.AlignmentLine alignmentLine, androidx.ui.core.Dp before = 0.dp, androidx.ui.core.Dp after = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
@@ -69,15 +35,14 @@
 
   public final class AspectRatioKt {
     ctor public AspectRatioKt();
-    method public static androidx.ui.core.LayoutModifier AspectRatio(@FloatRange(from=0.0, fromInclusive=false) float value);
     method @Deprecated public static void AspectRatio(float aspectRatio, kotlin.jvm.functions.Function0<kotlin.Unit> children);
   }
 
   public final class ColumnScope extends androidx.ui.layout.FlexScope {
-    method public androidx.ui.core.LayoutModifier RelativeToSiblings(androidx.ui.layout.Gravity, androidx.ui.core.VerticalAlignmentLine alignmentLine);
-    method public androidx.ui.core.LayoutModifier getCenter(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getEnd(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getStart(androidx.ui.layout.Gravity);
+    method public androidx.ui.core.LayoutModifier RelativeToSiblings(androidx.ui.layout.LayoutGravity, androidx.ui.core.VerticalAlignmentLine alignmentLine);
+    method public androidx.ui.core.LayoutModifier getCenter(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getEnd(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getStart(androidx.ui.layout.LayoutGravity);
     property public final androidx.ui.core.LayoutModifier Center;
     property public final androidx.ui.core.LayoutModifier End;
     property public final androidx.ui.core.LayoutModifier Start;
@@ -167,9 +132,9 @@
 
   public final class ExpandedModifierKt {
     ctor public ExpandedModifierKt();
-    method public static androidx.ui.core.LayoutModifier getExpanded();
-    method public static androidx.ui.core.LayoutModifier getExpandedHeight();
-    method public static androidx.ui.core.LayoutModifier getExpandedWidth();
+    method public static androidx.ui.core.LayoutModifier getLayoutExpanded();
+    method public static androidx.ui.core.LayoutModifier getLayoutExpandedHeight();
+    method public static androidx.ui.core.LayoutModifier getLayoutExpandedWidth();
   }
 
   public final class FlexChildren {
@@ -187,10 +152,10 @@
   }
 
   @androidx.ui.layout.LayoutScopeMarker public abstract sealed class FlexScope {
-    method public final androidx.ui.core.LayoutModifier Flexible(@FloatRange(from=0.0, fromInclusive=false) float flex, boolean tight = true);
-    method public final androidx.ui.core.LayoutModifier RelativeToSiblings(androidx.ui.layout.Gravity, kotlin.jvm.functions.Function1<? super androidx.ui.core.Placeable,androidx.ui.core.IntPx> alignmentLineBlock);
-    method public final androidx.ui.core.LayoutModifier getInflexible();
-    property public final androidx.ui.core.LayoutModifier Inflexible;
+    method public final androidx.ui.core.LayoutModifier LayoutFlexible(@FloatRange(from=0.0, fromInclusive=false) float flex, boolean tight = true);
+    method public final androidx.ui.core.LayoutModifier RelativeToSiblings(androidx.ui.layout.LayoutGravity, kotlin.jvm.functions.Function1<? super androidx.ui.core.Placeable,androidx.ui.core.IntPx> alignmentLineBlock);
+    method public final androidx.ui.core.LayoutModifier getLayoutInflexible();
+    property public final androidx.ui.core.LayoutModifier LayoutInflexible;
   }
 
   public enum FlowCrossAxisAlignment {
@@ -205,10 +170,6 @@
     method public static void FlowRow(androidx.ui.layout.LayoutSize mainAxisSize = androidx.ui.layout.LayoutSize.Wrap, androidx.ui.layout.MainAxisAlignment mainAxisAlignment = androidx.ui.layout.MainAxisAlignment.Start, androidx.ui.core.Dp mainAxisSpacing = 0.dp, androidx.ui.layout.FlowCrossAxisAlignment crossAxisAlignment = androidx.ui.layout.FlowCrossAxisAlignment.Start, androidx.ui.core.Dp crossAxisSpacing = 0.dp, androidx.ui.layout.MainAxisAlignment lastLineMainAxisAlignment = mainAxisAlignment, kotlin.jvm.functions.Function0<kotlin.Unit> children);
   }
 
-  public final class Gravity {
-    field public static final androidx.ui.layout.Gravity! INSTANCE;
-  }
-
   public final class IntrinsicKt {
     ctor public IntrinsicKt();
     method public static void MaxIntrinsicHeight(kotlin.jvm.functions.Function0<kotlin.Unit> children);
@@ -217,6 +178,73 @@
     method public static void MinIntrinsicWidth(kotlin.jvm.functions.Function0<kotlin.Unit> children);
   }
 
+  public final class LayoutAlign {
+    method public androidx.ui.core.LayoutModifier getBottom();
+    method public androidx.ui.core.LayoutModifier getBottomCenter();
+    method public androidx.ui.core.LayoutModifier getBottomLeft();
+    method public androidx.ui.core.LayoutModifier getBottomRight();
+    method public androidx.ui.core.LayoutModifier getCenter();
+    method public androidx.ui.core.LayoutModifier getCenterHorizontally();
+    method public androidx.ui.core.LayoutModifier getCenterLeft();
+    method public androidx.ui.core.LayoutModifier getCenterRight();
+    method public androidx.ui.core.LayoutModifier getCenterVertically();
+    method public androidx.ui.core.LayoutModifier getEnd();
+    method public androidx.ui.core.LayoutModifier getStart();
+    method public androidx.ui.core.LayoutModifier getTop();
+    method public androidx.ui.core.LayoutModifier getTopCenter();
+    method public androidx.ui.core.LayoutModifier getTopLeft();
+    method public androidx.ui.core.LayoutModifier getTopRight();
+    property public final androidx.ui.core.LayoutModifier Bottom;
+    property public final androidx.ui.core.LayoutModifier BottomCenter;
+    property public final androidx.ui.core.LayoutModifier BottomLeft;
+    property public final androidx.ui.core.LayoutModifier BottomRight;
+    property public final androidx.ui.core.LayoutModifier Center;
+    property public final androidx.ui.core.LayoutModifier CenterHorizontally;
+    property public final androidx.ui.core.LayoutModifier CenterLeft;
+    property public final androidx.ui.core.LayoutModifier CenterRight;
+    property public final androidx.ui.core.LayoutModifier CenterVertically;
+    property public final androidx.ui.core.LayoutModifier End;
+    property public final androidx.ui.core.LayoutModifier Start;
+    property public final androidx.ui.core.LayoutModifier Top;
+    property public final androidx.ui.core.LayoutModifier TopCenter;
+    property public final androidx.ui.core.LayoutModifier TopLeft;
+    property public final androidx.ui.core.LayoutModifier TopRight;
+    field public static final androidx.ui.layout.LayoutAlign! INSTANCE;
+  }
+
+  public final class LayoutAspectRatio implements androidx.ui.core.LayoutModifier {
+    ctor public LayoutAspectRatio(@FloatRange(from=null, fromInclusive=null) float aspectRatio);
+    method public float component1();
+    method public androidx.ui.layout.LayoutAspectRatio copy(float aspectRatio);
+    method public float getAspectRatio();
+    method public androidx.ui.core.IntPx maxIntrinsicHeightOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx width);
+    method public androidx.ui.core.IntPx maxIntrinsicWidthOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx height);
+    method public androidx.ui.core.IntPx minIntrinsicHeightOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx width);
+    method public androidx.ui.core.IntPx minIntrinsicWidthOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx height);
+    method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
+  }
+
+  public final class LayoutGravity {
+    field public static final androidx.ui.layout.LayoutGravity! INSTANCE;
+  }
+
+  public final class LayoutPadding implements androidx.ui.core.LayoutModifier {
+    ctor public LayoutPadding(androidx.ui.core.Dp left, androidx.ui.core.Dp top, androidx.ui.core.Dp right, androidx.ui.core.Dp bottom);
+    ctor public LayoutPadding();
+    method public androidx.ui.core.Dp component1();
+    method public androidx.ui.core.Dp component2();
+    method public androidx.ui.core.Dp component3();
+    method public androidx.ui.core.Dp component4();
+    method public androidx.ui.layout.LayoutPadding copy(androidx.ui.core.Dp left, androidx.ui.core.Dp top, androidx.ui.core.Dp right, androidx.ui.core.Dp bottom);
+    method public androidx.ui.core.Dp getBottom();
+    method public androidx.ui.core.Dp getLeft();
+    method public androidx.ui.core.Dp getRight();
+    method public androidx.ui.core.Dp getTop();
+    method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
+    method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
+    method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+  }
+
   @kotlin.DslMarker public @interface LayoutScopeMarker {
   }
 
@@ -234,11 +262,21 @@
     enum_constant public static final androidx.ui.layout.MainAxisAlignment Start;
   }
 
+  public final class PaddingKt {
+    ctor public PaddingKt();
+    method public static androidx.ui.layout.LayoutPadding LayoutPadding(androidx.ui.core.Dp all);
+    method public static void Padding(androidx.ui.layout.EdgeInsets padding, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static void Padding(androidx.ui.core.Dp left = 0.dp, androidx.ui.core.Dp top = 0.dp, androidx.ui.core.Dp right = 0.dp, androidx.ui.core.Dp bottom = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static void Padding(androidx.ui.core.Dp padding, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method @Deprecated public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.core.Dp left = 0.dp, androidx.ui.core.Dp top = 0.dp, androidx.ui.core.Dp right = 0.dp, androidx.ui.core.Dp bottom = 0.dp);
+    method @Deprecated public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.core.Dp all = 0.dp);
+  }
+
   public final class RowScope extends androidx.ui.layout.FlexScope {
-    method public androidx.ui.core.LayoutModifier RelativeToSiblings(androidx.ui.layout.Gravity, androidx.ui.core.HorizontalAlignmentLine alignmentLine);
-    method public androidx.ui.core.LayoutModifier getBottom(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getCenter(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getTop(androidx.ui.layout.Gravity);
+    method public androidx.ui.core.LayoutModifier RelativeToSiblings(androidx.ui.layout.LayoutGravity, androidx.ui.core.HorizontalAlignmentLine alignmentLine);
+    method public androidx.ui.core.LayoutModifier getBottom(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getCenter(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getTop(androidx.ui.layout.LayoutGravity);
     property public final androidx.ui.core.LayoutModifier Bottom;
     property public final androidx.ui.core.LayoutModifier Center;
     property public final androidx.ui.core.LayoutModifier Top;
@@ -246,15 +284,15 @@
 
   public final class SizeModifiersKt {
     ctor public SizeModifiersKt();
-    method public static androidx.ui.core.LayoutModifier Height(androidx.ui.core.Dp value);
-    method public static androidx.ui.core.LayoutModifier MaxHeight(androidx.ui.core.Dp value);
-    method public static androidx.ui.core.LayoutModifier MaxSize(androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp maxHeight);
-    method public static androidx.ui.core.LayoutModifier MaxWidth(androidx.ui.core.Dp value);
-    method public static androidx.ui.core.LayoutModifier MinHeight(androidx.ui.core.Dp value);
-    method public static androidx.ui.core.LayoutModifier MinSize(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp minHeight);
-    method public static androidx.ui.core.LayoutModifier MinWidth(androidx.ui.core.Dp value);
-    method public static androidx.ui.core.LayoutModifier Size(androidx.ui.core.Dp width, androidx.ui.core.Dp height);
-    method public static androidx.ui.core.LayoutModifier Width(androidx.ui.core.Dp value);
+    method public static androidx.ui.core.LayoutModifier LayoutHeight(androidx.ui.core.Dp value);
+    method public static androidx.ui.core.LayoutModifier LayoutMaxHeight(androidx.ui.core.Dp value);
+    method public static androidx.ui.core.LayoutModifier LayoutMaxSize(androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp maxHeight);
+    method public static androidx.ui.core.LayoutModifier LayoutMaxWidth(androidx.ui.core.Dp value);
+    method public static androidx.ui.core.LayoutModifier LayoutMinHeight(androidx.ui.core.Dp value);
+    method public static androidx.ui.core.LayoutModifier LayoutMinSize(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp minHeight);
+    method public static androidx.ui.core.LayoutModifier LayoutMinWidth(androidx.ui.core.Dp value);
+    method public static androidx.ui.core.LayoutModifier LayoutSize(androidx.ui.core.Dp width, androidx.ui.core.Dp height);
+    method public static androidx.ui.core.LayoutModifier LayoutWidth(androidx.ui.core.Dp value);
   }
 
   public final class SpacerKt {
@@ -262,15 +300,6 @@
     method public static void Spacer(androidx.ui.core.Modifier modifier);
   }
 
-  public final class SpacingKt {
-    ctor public SpacingKt();
-    method public static void Padding(androidx.ui.layout.EdgeInsets padding, kotlin.jvm.functions.Function0<kotlin.Unit> children);
-    method public static void Padding(androidx.ui.core.Dp left = 0.dp, androidx.ui.core.Dp top = 0.dp, androidx.ui.core.Dp right = 0.dp, androidx.ui.core.Dp bottom = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
-    method public static void Padding(androidx.ui.core.Dp padding, kotlin.jvm.functions.Function0<kotlin.Unit> children);
-    method public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.core.Dp left = 0.dp, androidx.ui.core.Dp top = 0.dp, androidx.ui.core.Dp right = 0.dp, androidx.ui.core.Dp bottom = 0.dp);
-    method public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.core.Dp all = 0.dp);
-  }
-
   public final class StackKt {
     ctor public StackKt();
     method public static void Stack(androidx.ui.core.Modifier modifier = Modifier.None, kotlin.jvm.functions.Function1<? super androidx.ui.layout.StackScope,kotlin.Unit> children);
@@ -278,16 +307,16 @@
 
   @androidx.ui.layout.LayoutScopeMarker public final class StackScope {
     ctor public StackScope();
-    method public androidx.ui.core.LayoutModifier getBottomCenter(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getBottomLeft(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getBottomRight(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getCenter(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getCenterLeft(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getCenterRight(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getStretch(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getTopCenter(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getTopLeft(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getTopRight(androidx.ui.layout.Gravity);
+    method public androidx.ui.core.LayoutModifier getBottomCenter(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getBottomLeft(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getBottomRight(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getCenter(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getCenterLeft(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getCenterRight(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getStretch(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getTopCenter(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getTopLeft(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getTopRight(androidx.ui.layout.LayoutGravity);
     property public final androidx.ui.core.LayoutModifier BottomCenter;
     property public final androidx.ui.core.LayoutModifier BottomLeft;
     property public final androidx.ui.core.LayoutModifier BottomRight;
@@ -387,7 +416,7 @@
   public final class WrapKt {
     ctor public WrapKt();
     method public static void Wrap(androidx.ui.core.Alignment alignment = Alignment.TopLeft, kotlin.jvm.functions.Function0<kotlin.Unit> children);
-    method public static androidx.ui.core.LayoutModifier getWrapped();
+    method public static androidx.ui.core.LayoutModifier getLayoutWrapped();
   }
 
 }

diff --git a/ui/ui-layout/api/restricted_0.1.0-dev04.txt b/ui/ui-layout/api/restricted_0.1.0-dev04.txt
index f0f5759..312c8ea 100644
--- a/ui/ui-layout/api/restricted_0.1.0-dev04.txt
+++ b/ui/ui-layout/api/restricted_0.1.0-dev04.txt

@@ -7,40 +7,6 @@
     method public static void Center(kotlin.jvm.functions.Function0<kotlin.Unit> children);
   }
 
-  public final class Aligned {
-    method public androidx.ui.core.LayoutModifier getBottom();
-    method public androidx.ui.core.LayoutModifier getBottomCenter();
-    method public androidx.ui.core.LayoutModifier getBottomLeft();
-    method public androidx.ui.core.LayoutModifier getBottomRight();
-    method public androidx.ui.core.LayoutModifier getCenter();
-    method public androidx.ui.core.LayoutModifier getCenterHorizontally();
-    method public androidx.ui.core.LayoutModifier getCenterLeft();
-    method public androidx.ui.core.LayoutModifier getCenterRight();
-    method public androidx.ui.core.LayoutModifier getCenterVertically();
-    method public androidx.ui.core.LayoutModifier getEnd();
-    method public androidx.ui.core.LayoutModifier getStart();
-    method public androidx.ui.core.LayoutModifier getTop();
-    method public androidx.ui.core.LayoutModifier getTopCenter();
-    method public androidx.ui.core.LayoutModifier getTopLeft();
-    method public androidx.ui.core.LayoutModifier getTopRight();
-    property public final androidx.ui.core.LayoutModifier Bottom;
-    property public final androidx.ui.core.LayoutModifier BottomCenter;
-    property public final androidx.ui.core.LayoutModifier BottomLeft;
-    property public final androidx.ui.core.LayoutModifier BottomRight;
-    property public final androidx.ui.core.LayoutModifier Center;
-    property public final androidx.ui.core.LayoutModifier CenterHorizontally;
-    property public final androidx.ui.core.LayoutModifier CenterLeft;
-    property public final androidx.ui.core.LayoutModifier CenterRight;
-    property public final androidx.ui.core.LayoutModifier CenterVertically;
-    property public final androidx.ui.core.LayoutModifier End;
-    property public final androidx.ui.core.LayoutModifier Start;
-    property public final androidx.ui.core.LayoutModifier Top;
-    property public final androidx.ui.core.LayoutModifier TopCenter;
-    property public final androidx.ui.core.LayoutModifier TopLeft;
-    property public final androidx.ui.core.LayoutModifier TopRight;
-    field public static final androidx.ui.layout.Aligned! INSTANCE;
-  }
-
   public final class AlignmentLineKt {
     ctor public AlignmentLineKt();
     method public static void AlignmentLineOffset(androidx.ui.core.AlignmentLine alignmentLine, androidx.ui.core.Dp before = 0.dp, androidx.ui.core.Dp after = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
@@ -69,15 +35,14 @@
 
   public final class AspectRatioKt {
     ctor public AspectRatioKt();
-    method public static androidx.ui.core.LayoutModifier AspectRatio(@FloatRange(from=0.0, fromInclusive=false) float value);
     method @Deprecated public static void AspectRatio(float aspectRatio, kotlin.jvm.functions.Function0<kotlin.Unit> children);
   }
 
   public final class ColumnScope extends androidx.ui.layout.FlexScope {
-    method public androidx.ui.core.LayoutModifier RelativeToSiblings(androidx.ui.layout.Gravity, androidx.ui.core.VerticalAlignmentLine alignmentLine);
-    method public androidx.ui.core.LayoutModifier getCenter(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getEnd(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getStart(androidx.ui.layout.Gravity);
+    method public androidx.ui.core.LayoutModifier RelativeToSiblings(androidx.ui.layout.LayoutGravity, androidx.ui.core.VerticalAlignmentLine alignmentLine);
+    method public androidx.ui.core.LayoutModifier getCenter(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getEnd(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getStart(androidx.ui.layout.LayoutGravity);
     property public final androidx.ui.core.LayoutModifier Center;
     property public final androidx.ui.core.LayoutModifier End;
     property public final androidx.ui.core.LayoutModifier Start;
@@ -167,9 +132,9 @@
 
   public final class ExpandedModifierKt {
     ctor public ExpandedModifierKt();
-    method public static androidx.ui.core.LayoutModifier getExpanded();
-    method public static androidx.ui.core.LayoutModifier getExpandedHeight();
-    method public static androidx.ui.core.LayoutModifier getExpandedWidth();
+    method public static androidx.ui.core.LayoutModifier getLayoutExpanded();
+    method public static androidx.ui.core.LayoutModifier getLayoutExpandedHeight();
+    method public static androidx.ui.core.LayoutModifier getLayoutExpandedWidth();
   }
 
   public final class FlexChildren {
@@ -187,10 +152,10 @@
   }
 
   @androidx.ui.layout.LayoutScopeMarker public abstract sealed class FlexScope {
-    method public final androidx.ui.core.LayoutModifier Flexible(@FloatRange(from=0.0, fromInclusive=false) float flex, boolean tight = true);
-    method public final androidx.ui.core.LayoutModifier RelativeToSiblings(androidx.ui.layout.Gravity, kotlin.jvm.functions.Function1<? super androidx.ui.core.Placeable,androidx.ui.core.IntPx> alignmentLineBlock);
-    method public final androidx.ui.core.LayoutModifier getInflexible();
-    property public final androidx.ui.core.LayoutModifier Inflexible;
+    method public final androidx.ui.core.LayoutModifier LayoutFlexible(@FloatRange(from=0.0, fromInclusive=false) float flex, boolean tight = true);
+    method public final androidx.ui.core.LayoutModifier RelativeToSiblings(androidx.ui.layout.LayoutGravity, kotlin.jvm.functions.Function1<? super androidx.ui.core.Placeable,androidx.ui.core.IntPx> alignmentLineBlock);
+    method public final androidx.ui.core.LayoutModifier getLayoutInflexible();
+    property public final androidx.ui.core.LayoutModifier LayoutInflexible;
   }
 
   public enum FlowCrossAxisAlignment {
@@ -205,10 +170,6 @@
     method public static void FlowRow(androidx.ui.layout.LayoutSize mainAxisSize = androidx.ui.layout.LayoutSize.Wrap, androidx.ui.layout.MainAxisAlignment mainAxisAlignment = androidx.ui.layout.MainAxisAlignment.Start, androidx.ui.core.Dp mainAxisSpacing = 0.dp, androidx.ui.layout.FlowCrossAxisAlignment crossAxisAlignment = androidx.ui.layout.FlowCrossAxisAlignment.Start, androidx.ui.core.Dp crossAxisSpacing = 0.dp, androidx.ui.layout.MainAxisAlignment lastLineMainAxisAlignment = mainAxisAlignment, kotlin.jvm.functions.Function0<kotlin.Unit> children);
   }
 
-  public final class Gravity {
-    field public static final androidx.ui.layout.Gravity! INSTANCE;
-  }
-
   public final class IntrinsicKt {
     ctor public IntrinsicKt();
     method public static void MaxIntrinsicHeight(kotlin.jvm.functions.Function0<kotlin.Unit> children);
@@ -217,6 +178,73 @@
     method public static void MinIntrinsicWidth(kotlin.jvm.functions.Function0<kotlin.Unit> children);
   }
 
+  public final class LayoutAlign {
+    method public androidx.ui.core.LayoutModifier getBottom();
+    method public androidx.ui.core.LayoutModifier getBottomCenter();
+    method public androidx.ui.core.LayoutModifier getBottomLeft();
+    method public androidx.ui.core.LayoutModifier getBottomRight();
+    method public androidx.ui.core.LayoutModifier getCenter();
+    method public androidx.ui.core.LayoutModifier getCenterHorizontally();
+    method public androidx.ui.core.LayoutModifier getCenterLeft();
+    method public androidx.ui.core.LayoutModifier getCenterRight();
+    method public androidx.ui.core.LayoutModifier getCenterVertically();
+    method public androidx.ui.core.LayoutModifier getEnd();
+    method public androidx.ui.core.LayoutModifier getStart();
+    method public androidx.ui.core.LayoutModifier getTop();
+    method public androidx.ui.core.LayoutModifier getTopCenter();
+    method public androidx.ui.core.LayoutModifier getTopLeft();
+    method public androidx.ui.core.LayoutModifier getTopRight();
+    property public final androidx.ui.core.LayoutModifier Bottom;
+    property public final androidx.ui.core.LayoutModifier BottomCenter;
+    property public final androidx.ui.core.LayoutModifier BottomLeft;
+    property public final androidx.ui.core.LayoutModifier BottomRight;
+    property public final androidx.ui.core.LayoutModifier Center;
+    property public final androidx.ui.core.LayoutModifier CenterHorizontally;
+    property public final androidx.ui.core.LayoutModifier CenterLeft;
+    property public final androidx.ui.core.LayoutModifier CenterRight;
+    property public final androidx.ui.core.LayoutModifier CenterVertically;
+    property public final androidx.ui.core.LayoutModifier End;
+    property public final androidx.ui.core.LayoutModifier Start;
+    property public final androidx.ui.core.LayoutModifier Top;
+    property public final androidx.ui.core.LayoutModifier TopCenter;
+    property public final androidx.ui.core.LayoutModifier TopLeft;
+    property public final androidx.ui.core.LayoutModifier TopRight;
+    field public static final androidx.ui.layout.LayoutAlign! INSTANCE;
+  }
+
+  public final class LayoutAspectRatio implements androidx.ui.core.LayoutModifier {
+    ctor public LayoutAspectRatio(@FloatRange(from=null, fromInclusive=null) float aspectRatio);
+    method public float component1();
+    method public androidx.ui.layout.LayoutAspectRatio copy(float aspectRatio);
+    method public float getAspectRatio();
+    method public androidx.ui.core.IntPx maxIntrinsicHeightOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx width);
+    method public androidx.ui.core.IntPx maxIntrinsicWidthOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx height);
+    method public androidx.ui.core.IntPx minIntrinsicHeightOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx width);
+    method public androidx.ui.core.IntPx minIntrinsicWidthOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx height);
+    method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
+  }
+
+  public final class LayoutGravity {
+    field public static final androidx.ui.layout.LayoutGravity! INSTANCE;
+  }
+
+  public final class LayoutPadding implements androidx.ui.core.LayoutModifier {
+    ctor public LayoutPadding(androidx.ui.core.Dp left, androidx.ui.core.Dp top, androidx.ui.core.Dp right, androidx.ui.core.Dp bottom);
+    ctor public LayoutPadding();
+    method public androidx.ui.core.Dp component1();
+    method public androidx.ui.core.Dp component2();
+    method public androidx.ui.core.Dp component3();
+    method public androidx.ui.core.Dp component4();
+    method public androidx.ui.layout.LayoutPadding copy(androidx.ui.core.Dp left, androidx.ui.core.Dp top, androidx.ui.core.Dp right, androidx.ui.core.Dp bottom);
+    method public androidx.ui.core.Dp getBottom();
+    method public androidx.ui.core.Dp getLeft();
+    method public androidx.ui.core.Dp getRight();
+    method public androidx.ui.core.Dp getTop();
+    method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
+    method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
+    method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+  }
+
   @kotlin.DslMarker public @interface LayoutScopeMarker {
   }
 
@@ -234,11 +262,21 @@
     enum_constant public static final androidx.ui.layout.MainAxisAlignment Start;
   }
 
+  public final class PaddingKt {
+    ctor public PaddingKt();
+    method public static androidx.ui.layout.LayoutPadding LayoutPadding(androidx.ui.core.Dp all);
+    method public static void Padding(androidx.ui.layout.EdgeInsets padding, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static void Padding(androidx.ui.core.Dp left = 0.dp, androidx.ui.core.Dp top = 0.dp, androidx.ui.core.Dp right = 0.dp, androidx.ui.core.Dp bottom = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static void Padding(androidx.ui.core.Dp padding, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method @Deprecated public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.core.Dp left = 0.dp, androidx.ui.core.Dp top = 0.dp, androidx.ui.core.Dp right = 0.dp, androidx.ui.core.Dp bottom = 0.dp);
+    method @Deprecated public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.core.Dp all = 0.dp);
+  }
+
   public final class RowScope extends androidx.ui.layout.FlexScope {
-    method public androidx.ui.core.LayoutModifier RelativeToSiblings(androidx.ui.layout.Gravity, androidx.ui.core.HorizontalAlignmentLine alignmentLine);
-    method public androidx.ui.core.LayoutModifier getBottom(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getCenter(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getTop(androidx.ui.layout.Gravity);
+    method public androidx.ui.core.LayoutModifier RelativeToSiblings(androidx.ui.layout.LayoutGravity, androidx.ui.core.HorizontalAlignmentLine alignmentLine);
+    method public androidx.ui.core.LayoutModifier getBottom(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getCenter(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getTop(androidx.ui.layout.LayoutGravity);
     property public final androidx.ui.core.LayoutModifier Bottom;
     property public final androidx.ui.core.LayoutModifier Center;
     property public final androidx.ui.core.LayoutModifier Top;
@@ -246,15 +284,15 @@
 
   public final class SizeModifiersKt {
     ctor public SizeModifiersKt();
-    method public static androidx.ui.core.LayoutModifier Height(androidx.ui.core.Dp value);
-    method public static androidx.ui.core.LayoutModifier MaxHeight(androidx.ui.core.Dp value);
-    method public static androidx.ui.core.LayoutModifier MaxSize(androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp maxHeight);
-    method public static androidx.ui.core.LayoutModifier MaxWidth(androidx.ui.core.Dp value);
-    method public static androidx.ui.core.LayoutModifier MinHeight(androidx.ui.core.Dp value);
-    method public static androidx.ui.core.LayoutModifier MinSize(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp minHeight);
-    method public static androidx.ui.core.LayoutModifier MinWidth(androidx.ui.core.Dp value);
-    method public static androidx.ui.core.LayoutModifier Size(androidx.ui.core.Dp width, androidx.ui.core.Dp height);
-    method public static androidx.ui.core.LayoutModifier Width(androidx.ui.core.Dp value);
+    method public static androidx.ui.core.LayoutModifier LayoutHeight(androidx.ui.core.Dp value);
+    method public static androidx.ui.core.LayoutModifier LayoutMaxHeight(androidx.ui.core.Dp value);
+    method public static androidx.ui.core.LayoutModifier LayoutMaxSize(androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp maxHeight);
+    method public static androidx.ui.core.LayoutModifier LayoutMaxWidth(androidx.ui.core.Dp value);
+    method public static androidx.ui.core.LayoutModifier LayoutMinHeight(androidx.ui.core.Dp value);
+    method public static androidx.ui.core.LayoutModifier LayoutMinSize(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp minHeight);
+    method public static androidx.ui.core.LayoutModifier LayoutMinWidth(androidx.ui.core.Dp value);
+    method public static androidx.ui.core.LayoutModifier LayoutSize(androidx.ui.core.Dp width, androidx.ui.core.Dp height);
+    method public static androidx.ui.core.LayoutModifier LayoutWidth(androidx.ui.core.Dp value);
   }
 
   public final class SpacerKt {
@@ -262,15 +300,6 @@
     method public static void Spacer(androidx.ui.core.Modifier modifier);
   }
 
-  public final class SpacingKt {
-    ctor public SpacingKt();
-    method public static void Padding(androidx.ui.layout.EdgeInsets padding, kotlin.jvm.functions.Function0<kotlin.Unit> children);
-    method public static void Padding(androidx.ui.core.Dp left = 0.dp, androidx.ui.core.Dp top = 0.dp, androidx.ui.core.Dp right = 0.dp, androidx.ui.core.Dp bottom = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
-    method public static void Padding(androidx.ui.core.Dp padding, kotlin.jvm.functions.Function0<kotlin.Unit> children);
-    method public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.core.Dp left = 0.dp, androidx.ui.core.Dp top = 0.dp, androidx.ui.core.Dp right = 0.dp, androidx.ui.core.Dp bottom = 0.dp);
-    method public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.core.Dp all = 0.dp);
-  }
-
   public final class StackKt {
     ctor public StackKt();
     method public static void Stack(androidx.ui.core.Modifier modifier = Modifier.None, kotlin.jvm.functions.Function1<? super androidx.ui.layout.StackScope,kotlin.Unit> children);
@@ -278,16 +307,16 @@
 
   @androidx.ui.layout.LayoutScopeMarker public final class StackScope {
     ctor public StackScope();
-    method public androidx.ui.core.LayoutModifier getBottomCenter(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getBottomLeft(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getBottomRight(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getCenter(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getCenterLeft(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getCenterRight(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getStretch(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getTopCenter(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getTopLeft(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getTopRight(androidx.ui.layout.Gravity);
+    method public androidx.ui.core.LayoutModifier getBottomCenter(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getBottomLeft(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getBottomRight(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getCenter(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getCenterLeft(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getCenterRight(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getStretch(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getTopCenter(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getTopLeft(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getTopRight(androidx.ui.layout.LayoutGravity);
     property public final androidx.ui.core.LayoutModifier BottomCenter;
     property public final androidx.ui.core.LayoutModifier BottomLeft;
     property public final androidx.ui.core.LayoutModifier BottomRight;
@@ -387,7 +416,7 @@
   public final class WrapKt {
     ctor public WrapKt();
     method public static void Wrap(androidx.ui.core.Alignment alignment = Alignment.TopLeft, kotlin.jvm.functions.Function0<kotlin.Unit> children);
-    method public static androidx.ui.core.LayoutModifier getWrapped();
+    method public static androidx.ui.core.LayoutModifier getLayoutWrapped();
   }
 
 }

diff --git a/ui/ui-layout/api/restricted_current.txt b/ui/ui-layout/api/restricted_current.txt
index f0f5759..312c8ea 100644
--- a/ui/ui-layout/api/restricted_current.txt
+++ b/ui/ui-layout/api/restricted_current.txt

@@ -7,40 +7,6 @@
     method public static void Center(kotlin.jvm.functions.Function0<kotlin.Unit> children);
   }
 
-  public final class Aligned {
-    method public androidx.ui.core.LayoutModifier getBottom();
-    method public androidx.ui.core.LayoutModifier getBottomCenter();
-    method public androidx.ui.core.LayoutModifier getBottomLeft();
-    method public androidx.ui.core.LayoutModifier getBottomRight();
-    method public androidx.ui.core.LayoutModifier getCenter();
-    method public androidx.ui.core.LayoutModifier getCenterHorizontally();
-    method public androidx.ui.core.LayoutModifier getCenterLeft();
-    method public androidx.ui.core.LayoutModifier getCenterRight();
-    method public androidx.ui.core.LayoutModifier getCenterVertically();
-    method public androidx.ui.core.LayoutModifier getEnd();
-    method public androidx.ui.core.LayoutModifier getStart();
-    method public androidx.ui.core.LayoutModifier getTop();
-    method public androidx.ui.core.LayoutModifier getTopCenter();
-    method public androidx.ui.core.LayoutModifier getTopLeft();
-    method public androidx.ui.core.LayoutModifier getTopRight();
-    property public final androidx.ui.core.LayoutModifier Bottom;
-    property public final androidx.ui.core.LayoutModifier BottomCenter;
-    property public final androidx.ui.core.LayoutModifier BottomLeft;
-    property public final androidx.ui.core.LayoutModifier BottomRight;
-    property public final androidx.ui.core.LayoutModifier Center;
-    property public final androidx.ui.core.LayoutModifier CenterHorizontally;
-    property public final androidx.ui.core.LayoutModifier CenterLeft;
-    property public final androidx.ui.core.LayoutModifier CenterRight;
-    property public final androidx.ui.core.LayoutModifier CenterVertically;
-    property public final androidx.ui.core.LayoutModifier End;
-    property public final androidx.ui.core.LayoutModifier Start;
-    property public final androidx.ui.core.LayoutModifier Top;
-    property public final androidx.ui.core.LayoutModifier TopCenter;
-    property public final androidx.ui.core.LayoutModifier TopLeft;
-    property public final androidx.ui.core.LayoutModifier TopRight;
-    field public static final androidx.ui.layout.Aligned! INSTANCE;
-  }
-
   public final class AlignmentLineKt {
     ctor public AlignmentLineKt();
     method public static void AlignmentLineOffset(androidx.ui.core.AlignmentLine alignmentLine, androidx.ui.core.Dp before = 0.dp, androidx.ui.core.Dp after = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
@@ -69,15 +35,14 @@
 
   public final class AspectRatioKt {
     ctor public AspectRatioKt();
-    method public static androidx.ui.core.LayoutModifier AspectRatio(@FloatRange(from=0.0, fromInclusive=false) float value);
     method @Deprecated public static void AspectRatio(float aspectRatio, kotlin.jvm.functions.Function0<kotlin.Unit> children);
   }
 
   public final class ColumnScope extends androidx.ui.layout.FlexScope {
-    method public androidx.ui.core.LayoutModifier RelativeToSiblings(androidx.ui.layout.Gravity, androidx.ui.core.VerticalAlignmentLine alignmentLine);
-    method public androidx.ui.core.LayoutModifier getCenter(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getEnd(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getStart(androidx.ui.layout.Gravity);
+    method public androidx.ui.core.LayoutModifier RelativeToSiblings(androidx.ui.layout.LayoutGravity, androidx.ui.core.VerticalAlignmentLine alignmentLine);
+    method public androidx.ui.core.LayoutModifier getCenter(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getEnd(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getStart(androidx.ui.layout.LayoutGravity);
     property public final androidx.ui.core.LayoutModifier Center;
     property public final androidx.ui.core.LayoutModifier End;
     property public final androidx.ui.core.LayoutModifier Start;
@@ -167,9 +132,9 @@
 
   public final class ExpandedModifierKt {
     ctor public ExpandedModifierKt();
-    method public static androidx.ui.core.LayoutModifier getExpanded();
-    method public static androidx.ui.core.LayoutModifier getExpandedHeight();
-    method public static androidx.ui.core.LayoutModifier getExpandedWidth();
+    method public static androidx.ui.core.LayoutModifier getLayoutExpanded();
+    method public static androidx.ui.core.LayoutModifier getLayoutExpandedHeight();
+    method public static androidx.ui.core.LayoutModifier getLayoutExpandedWidth();
   }
 
   public final class FlexChildren {
@@ -187,10 +152,10 @@
   }
 
   @androidx.ui.layout.LayoutScopeMarker public abstract sealed class FlexScope {
-    method public final androidx.ui.core.LayoutModifier Flexible(@FloatRange(from=0.0, fromInclusive=false) float flex, boolean tight = true);
-    method public final androidx.ui.core.LayoutModifier RelativeToSiblings(androidx.ui.layout.Gravity, kotlin.jvm.functions.Function1<? super androidx.ui.core.Placeable,androidx.ui.core.IntPx> alignmentLineBlock);
-    method public final androidx.ui.core.LayoutModifier getInflexible();
-    property public final androidx.ui.core.LayoutModifier Inflexible;
+    method public final androidx.ui.core.LayoutModifier LayoutFlexible(@FloatRange(from=0.0, fromInclusive=false) float flex, boolean tight = true);
+    method public final androidx.ui.core.LayoutModifier RelativeToSiblings(androidx.ui.layout.LayoutGravity, kotlin.jvm.functions.Function1<? super androidx.ui.core.Placeable,androidx.ui.core.IntPx> alignmentLineBlock);
+    method public final androidx.ui.core.LayoutModifier getLayoutInflexible();
+    property public final androidx.ui.core.LayoutModifier LayoutInflexible;
   }
 
   public enum FlowCrossAxisAlignment {
@@ -205,10 +170,6 @@
     method public static void FlowRow(androidx.ui.layout.LayoutSize mainAxisSize = androidx.ui.layout.LayoutSize.Wrap, androidx.ui.layout.MainAxisAlignment mainAxisAlignment = androidx.ui.layout.MainAxisAlignment.Start, androidx.ui.core.Dp mainAxisSpacing = 0.dp, androidx.ui.layout.FlowCrossAxisAlignment crossAxisAlignment = androidx.ui.layout.FlowCrossAxisAlignment.Start, androidx.ui.core.Dp crossAxisSpacing = 0.dp, androidx.ui.layout.MainAxisAlignment lastLineMainAxisAlignment = mainAxisAlignment, kotlin.jvm.functions.Function0<kotlin.Unit> children);
   }
 
-  public final class Gravity {
-    field public static final androidx.ui.layout.Gravity! INSTANCE;
-  }
-
   public final class IntrinsicKt {
     ctor public IntrinsicKt();
     method public static void MaxIntrinsicHeight(kotlin.jvm.functions.Function0<kotlin.Unit> children);
@@ -217,6 +178,73 @@
     method public static void MinIntrinsicWidth(kotlin.jvm.functions.Function0<kotlin.Unit> children);
   }
 
+  public final class LayoutAlign {
+    method public androidx.ui.core.LayoutModifier getBottom();
+    method public androidx.ui.core.LayoutModifier getBottomCenter();
+    method public androidx.ui.core.LayoutModifier getBottomLeft();
+    method public androidx.ui.core.LayoutModifier getBottomRight();
+    method public androidx.ui.core.LayoutModifier getCenter();
+    method public androidx.ui.core.LayoutModifier getCenterHorizontally();
+    method public androidx.ui.core.LayoutModifier getCenterLeft();
+    method public androidx.ui.core.LayoutModifier getCenterRight();
+    method public androidx.ui.core.LayoutModifier getCenterVertically();
+    method public androidx.ui.core.LayoutModifier getEnd();
+    method public androidx.ui.core.LayoutModifier getStart();
+    method public androidx.ui.core.LayoutModifier getTop();
+    method public androidx.ui.core.LayoutModifier getTopCenter();
+    method public androidx.ui.core.LayoutModifier getTopLeft();
+    method public androidx.ui.core.LayoutModifier getTopRight();
+    property public final androidx.ui.core.LayoutModifier Bottom;
+    property public final androidx.ui.core.LayoutModifier BottomCenter;
+    property public final androidx.ui.core.LayoutModifier BottomLeft;
+    property public final androidx.ui.core.LayoutModifier BottomRight;
+    property public final androidx.ui.core.LayoutModifier Center;
+    property public final androidx.ui.core.LayoutModifier CenterHorizontally;
+    property public final androidx.ui.core.LayoutModifier CenterLeft;
+    property public final androidx.ui.core.LayoutModifier CenterRight;
+    property public final androidx.ui.core.LayoutModifier CenterVertically;
+    property public final androidx.ui.core.LayoutModifier End;
+    property public final androidx.ui.core.LayoutModifier Start;
+    property public final androidx.ui.core.LayoutModifier Top;
+    property public final androidx.ui.core.LayoutModifier TopCenter;
+    property public final androidx.ui.core.LayoutModifier TopLeft;
+    property public final androidx.ui.core.LayoutModifier TopRight;
+    field public static final androidx.ui.layout.LayoutAlign! INSTANCE;
+  }
+
+  public final class LayoutAspectRatio implements androidx.ui.core.LayoutModifier {
+    ctor public LayoutAspectRatio(@FloatRange(from=null, fromInclusive=null) float aspectRatio);
+    method public float component1();
+    method public androidx.ui.layout.LayoutAspectRatio copy(float aspectRatio);
+    method public float getAspectRatio();
+    method public androidx.ui.core.IntPx maxIntrinsicHeightOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx width);
+    method public androidx.ui.core.IntPx maxIntrinsicWidthOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx height);
+    method public androidx.ui.core.IntPx minIntrinsicHeightOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx width);
+    method public androidx.ui.core.IntPx minIntrinsicWidthOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx height);
+    method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
+  }
+
+  public final class LayoutGravity {
+    field public static final androidx.ui.layout.LayoutGravity! INSTANCE;
+  }
+
+  public final class LayoutPadding implements androidx.ui.core.LayoutModifier {
+    ctor public LayoutPadding(androidx.ui.core.Dp left, androidx.ui.core.Dp top, androidx.ui.core.Dp right, androidx.ui.core.Dp bottom);
+    ctor public LayoutPadding();
+    method public androidx.ui.core.Dp component1();
+    method public androidx.ui.core.Dp component2();
+    method public androidx.ui.core.Dp component3();
+    method public androidx.ui.core.Dp component4();
+    method public androidx.ui.layout.LayoutPadding copy(androidx.ui.core.Dp left, androidx.ui.core.Dp top, androidx.ui.core.Dp right, androidx.ui.core.Dp bottom);
+    method public androidx.ui.core.Dp getBottom();
+    method public androidx.ui.core.Dp getLeft();
+    method public androidx.ui.core.Dp getRight();
+    method public androidx.ui.core.Dp getTop();
+    method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
+    method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
+    method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+  }
+
   @kotlin.DslMarker public @interface LayoutScopeMarker {
   }
 
@@ -234,11 +262,21 @@
     enum_constant public static final androidx.ui.layout.MainAxisAlignment Start;
   }
 
+  public final class PaddingKt {
+    ctor public PaddingKt();
+    method public static androidx.ui.layout.LayoutPadding LayoutPadding(androidx.ui.core.Dp all);
+    method public static void Padding(androidx.ui.layout.EdgeInsets padding, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static void Padding(androidx.ui.core.Dp left = 0.dp, androidx.ui.core.Dp top = 0.dp, androidx.ui.core.Dp right = 0.dp, androidx.ui.core.Dp bottom = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static void Padding(androidx.ui.core.Dp padding, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method @Deprecated public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.core.Dp left = 0.dp, androidx.ui.core.Dp top = 0.dp, androidx.ui.core.Dp right = 0.dp, androidx.ui.core.Dp bottom = 0.dp);
+    method @Deprecated public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.core.Dp all = 0.dp);
+  }
+
   public final class RowScope extends androidx.ui.layout.FlexScope {
-    method public androidx.ui.core.LayoutModifier RelativeToSiblings(androidx.ui.layout.Gravity, androidx.ui.core.HorizontalAlignmentLine alignmentLine);
-    method public androidx.ui.core.LayoutModifier getBottom(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getCenter(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getTop(androidx.ui.layout.Gravity);
+    method public androidx.ui.core.LayoutModifier RelativeToSiblings(androidx.ui.layout.LayoutGravity, androidx.ui.core.HorizontalAlignmentLine alignmentLine);
+    method public androidx.ui.core.LayoutModifier getBottom(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getCenter(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getTop(androidx.ui.layout.LayoutGravity);
     property public final androidx.ui.core.LayoutModifier Bottom;
     property public final androidx.ui.core.LayoutModifier Center;
     property public final androidx.ui.core.LayoutModifier Top;
@@ -246,15 +284,15 @@
 
   public final class SizeModifiersKt {
     ctor public SizeModifiersKt();
-    method public static androidx.ui.core.LayoutModifier Height(androidx.ui.core.Dp value);
-    method public static androidx.ui.core.LayoutModifier MaxHeight(androidx.ui.core.Dp value);
-    method public static androidx.ui.core.LayoutModifier MaxSize(androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp maxHeight);
-    method public static androidx.ui.core.LayoutModifier MaxWidth(androidx.ui.core.Dp value);
-    method public static androidx.ui.core.LayoutModifier MinHeight(androidx.ui.core.Dp value);
-    method public static androidx.ui.core.LayoutModifier MinSize(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp minHeight);
-    method public static androidx.ui.core.LayoutModifier MinWidth(androidx.ui.core.Dp value);
-    method public static androidx.ui.core.LayoutModifier Size(androidx.ui.core.Dp width, androidx.ui.core.Dp height);
-    method public static androidx.ui.core.LayoutModifier Width(androidx.ui.core.Dp value);
+    method public static androidx.ui.core.LayoutModifier LayoutHeight(androidx.ui.core.Dp value);
+    method public static androidx.ui.core.LayoutModifier LayoutMaxHeight(androidx.ui.core.Dp value);
+    method public static androidx.ui.core.LayoutModifier LayoutMaxSize(androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp maxHeight);
+    method public static androidx.ui.core.LayoutModifier LayoutMaxWidth(androidx.ui.core.Dp value);
+    method public static androidx.ui.core.LayoutModifier LayoutMinHeight(androidx.ui.core.Dp value);
+    method public static androidx.ui.core.LayoutModifier LayoutMinSize(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp minHeight);
+    method public static androidx.ui.core.LayoutModifier LayoutMinWidth(androidx.ui.core.Dp value);
+    method public static androidx.ui.core.LayoutModifier LayoutSize(androidx.ui.core.Dp width, androidx.ui.core.Dp height);
+    method public static androidx.ui.core.LayoutModifier LayoutWidth(androidx.ui.core.Dp value);
   }
 
   public final class SpacerKt {
@@ -262,15 +300,6 @@
     method public static void Spacer(androidx.ui.core.Modifier modifier);
   }
 
-  public final class SpacingKt {
-    ctor public SpacingKt();
-    method public static void Padding(androidx.ui.layout.EdgeInsets padding, kotlin.jvm.functions.Function0<kotlin.Unit> children);
-    method public static void Padding(androidx.ui.core.Dp left = 0.dp, androidx.ui.core.Dp top = 0.dp, androidx.ui.core.Dp right = 0.dp, androidx.ui.core.Dp bottom = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
-    method public static void Padding(androidx.ui.core.Dp padding, kotlin.jvm.functions.Function0<kotlin.Unit> children);
-    method public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.core.Dp left = 0.dp, androidx.ui.core.Dp top = 0.dp, androidx.ui.core.Dp right = 0.dp, androidx.ui.core.Dp bottom = 0.dp);
-    method public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.core.Dp all = 0.dp);
-  }
-
   public final class StackKt {
     ctor public StackKt();
     method public static void Stack(androidx.ui.core.Modifier modifier = Modifier.None, kotlin.jvm.functions.Function1<? super androidx.ui.layout.StackScope,kotlin.Unit> children);
@@ -278,16 +307,16 @@
 
   @androidx.ui.layout.LayoutScopeMarker public final class StackScope {
     ctor public StackScope();
-    method public androidx.ui.core.LayoutModifier getBottomCenter(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getBottomLeft(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getBottomRight(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getCenter(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getCenterLeft(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getCenterRight(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getStretch(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getTopCenter(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getTopLeft(androidx.ui.layout.Gravity);
-    method public androidx.ui.core.LayoutModifier getTopRight(androidx.ui.layout.Gravity);
+    method public androidx.ui.core.LayoutModifier getBottomCenter(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getBottomLeft(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getBottomRight(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getCenter(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getCenterLeft(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getCenterRight(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getStretch(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getTopCenter(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getTopLeft(androidx.ui.layout.LayoutGravity);
+    method public androidx.ui.core.LayoutModifier getTopRight(androidx.ui.layout.LayoutGravity);
     property public final androidx.ui.core.LayoutModifier BottomCenter;
     property public final androidx.ui.core.LayoutModifier BottomLeft;
     property public final androidx.ui.core.LayoutModifier BottomRight;
@@ -387,7 +416,7 @@
   public final class WrapKt {
     ctor public WrapKt();
     method public static void Wrap(androidx.ui.core.Alignment alignment = Alignment.TopLeft, kotlin.jvm.functions.Function0<kotlin.Unit> children);
-    method public static androidx.ui.core.LayoutModifier getWrapped();
+    method public static androidx.ui.core.LayoutModifier getLayoutWrapped();
   }
 
 }

diff --git a/ui/ui-layout/integration-tests/layout-demos/src/main/java/androidx/ui/layout/demos/ComplexLayoutDemos.kt b/ui/ui-layout/integration-tests/layout-demos/src/main/java/androidx/ui/layout/demos/ComplexLayoutDemos.kt
index 03ea3fc..1ea504d 100644
--- a/ui/ui-layout/integration-tests/layout-demos/src/main/java/androidx/ui/layout/demos/ComplexLayoutDemos.kt
+++ b/ui/ui-layout/integration-tests/layout-demos/src/main/java/androidx/ui/layout/demos/ComplexLayoutDemos.kt

@@ -17,43 +17,43 @@
 package androidx.ui.layout.demos
 
 import android.os.Handler
-import androidx.ui.core.Constraints
-import androidx.ui.core.Draw
-import androidx.ui.core.IntPx
-import androidx.ui.core.IntPxSize
-import androidx.ui.core.Layout
-import androidx.ui.core.WithConstraints
-import androidx.ui.core.constrain
-import androidx.ui.core.dp
-import androidx.ui.core.ipx
-import androidx.ui.core.max
-import androidx.ui.core.toRect
-import androidx.ui.layout.Align
-import androidx.ui.layout.Center
-import androidx.ui.layout.Column
-import androidx.ui.layout.ConstrainedBox
-import androidx.ui.layout.DpConstraints
-import androidx.ui.layout.FlexColumn
-import androidx.ui.layout.FlexRow
-import androidx.ui.layout.Padding
-import androidx.ui.layout.Row
-import androidx.ui.layout.Stack
-import androidx.ui.graphics.Color
-import androidx.ui.graphics.Paint
 import androidx.compose.Composable
 import androidx.compose.Model
 import androidx.compose.effectOf
 import androidx.compose.memo
 import androidx.compose.onCommit
 import androidx.ui.core.Alignment
+import androidx.ui.core.Constraints
+import androidx.ui.core.Draw
 import androidx.ui.core.FirstBaseline
 import androidx.ui.core.HorizontalAlignmentLine
+import androidx.ui.core.IntPx
+import androidx.ui.core.IntPxSize
+import androidx.ui.core.Layout
 import androidx.ui.core.Text
 import androidx.ui.core.VerticalAlignmentLine
+import androidx.ui.core.WithConstraints
+import androidx.ui.core.constrain
+import androidx.ui.core.dp
+import androidx.ui.core.ipx
+import androidx.ui.core.max
 import androidx.ui.core.sp
+import androidx.ui.core.toRect
+import androidx.ui.graphics.Color
+import androidx.ui.graphics.Paint
+import androidx.ui.layout.Align
 import androidx.ui.layout.AlignmentLineOffset
-import androidx.ui.layout.Gravity
-import androidx.ui.layout.Spacing
+import androidx.ui.layout.Center
+import androidx.ui.layout.Column
+import androidx.ui.layout.ConstrainedBox
+import androidx.ui.layout.DpConstraints
+import androidx.ui.layout.FlexColumn
+import androidx.ui.layout.FlexRow
+import androidx.ui.layout.LayoutGravity
+import androidx.ui.layout.LayoutPadding
+import androidx.ui.layout.Padding
+import androidx.ui.layout.Row
+import androidx.ui.layout.Stack
 import androidx.ui.layout.Wrap
 import androidx.ui.layout.samples.DrawRectangle
 import androidx.ui.layout.samples.SizedRectangle
@@ -177,17 +177,17 @@
 @Composable
 fun StackUsage() {
     Stack {
-        SizedRectangle(Gravity.Stretch, color = Color(0xFFA52A2A))
-        SizedRectangle(Gravity.Stretch wraps Spacing(40.dp), color = Color(0xFFFFA500))
+        SizedRectangle(LayoutGravity.Stretch, color = Color(0xFFA52A2A))
+        SizedRectangle(LayoutGravity.Stretch wraps LayoutPadding(40.dp), color = Color(0xFFFFA500))
         SizedRectangle(
-            modifier = Gravity.Center,
+            modifier = LayoutGravity.Center,
             color = Color(0xFF0000FF),
             width = 300.dp,
             height = 300.dp
         )
         SizedRectangle(color = Color(0xFF00FF00), width = 150.dp, height = 150.dp)
         SizedRectangle(
-            modifier = Gravity.BottomRight,
+            modifier = LayoutGravity.BottomRight,
             color = Color(0xFFFF0000),
             width = 150.dp,
             height = 150.dp
@@ -376,8 +376,8 @@
 @Composable
 fun RowBaselineAlignment() {
     Row {
-        Text("First text", modifier = Gravity.RelativeToSiblings(FirstBaseline))
-        Column(modifier = Gravity.RelativeToSiblings(FirstBaseline)) {
+        Text("First text", modifier = LayoutGravity.RelativeToSiblings(FirstBaseline))
+        Column(modifier = LayoutGravity.RelativeToSiblings(FirstBaseline)) {
             SizedRectangle(color = Color.Blue, width = 10.dp, height = 50.dp)
             Padding(30.dp) {
                 Text("Second text", style = TextStyle(fontSize = 45.sp))

diff --git a/ui/ui-layout/integration-tests/layout-demos/src/main/java/androidx/ui/layout/demos/LayoutActivity.kt b/ui/ui-layout/integration-tests/layout-demos/src/main/java/androidx/ui/layout/demos/LayoutActivity.kt
index 72a62e2..56e6259 100644
--- a/ui/ui-layout/integration-tests/layout-demos/src/main/java/androidx/ui/layout/demos/LayoutActivity.kt
+++ b/ui/ui-layout/integration-tests/layout-demos/src/main/java/androidx/ui/layout/demos/LayoutActivity.kt

@@ -23,10 +23,10 @@
 import androidx.ui.core.dp
 import androidx.ui.layout.Column
 import androidx.ui.layout.Container
-import androidx.ui.layout.Height
+import androidx.ui.layout.LayoutHeight
 import androidx.ui.layout.Spacer
 import androidx.ui.layout.Row
-import androidx.ui.layout.Width
+import androidx.ui.layout.LayoutWidth
 import androidx.ui.layout.Wrap
 import androidx.ui.graphics.Color
 import androidx.ui.text.TextStyle
@@ -35,9 +35,9 @@
 import androidx.ui.core.setContent
 import androidx.ui.core.sp
 import androidx.ui.layout.Arrangement
-import androidx.ui.layout.ExpandedHeight
-import androidx.ui.layout.ExpandedWidth
-import androidx.ui.layout.Gravity
+import androidx.ui.layout.LayoutExpandedHeight
+import androidx.ui.layout.LayoutExpandedWidth
+import androidx.ui.layout.LayoutGravity
 import androidx.ui.layout.samples.DrawRectangle
 
 class LayoutActivity : Activity() {
@@ -69,74 +69,74 @@
     Column {
         Text(text = "Row", style = TextStyle(fontSize = 48.sp))
         ContainerWithBackground(width = ExampleSize, color = lightGrey) {
-            Row(ExpandedWidth) {
+            Row(LayoutExpandedWidth) {
                 PurpleSquare()
                 CyanSquare()
             }
         }
-        Spacer(Height(24.dp))
+        Spacer(LayoutHeight(24.dp))
         ContainerWithBackground(width = ExampleSize, color = lightGrey) {
-            Row(ExpandedWidth, arrangement = Arrangement.Center) {
+            Row(LayoutExpandedWidth, arrangement = Arrangement.Center) {
                 PurpleSquare()
                 CyanSquare()
             }
         }
-        Spacer(Height(24.dp))
+        Spacer(LayoutHeight(24.dp))
         ContainerWithBackground(width = ExampleSize, color = lightGrey) {
-            Row(ExpandedWidth, arrangement = Arrangement.End) {
+            Row(LayoutExpandedWidth, arrangement = Arrangement.End) {
                 PurpleSquare()
                 CyanSquare()
             }
         }
-        Spacer(Height(24.dp))
+        Spacer(LayoutHeight(24.dp))
         ContainerWithBackground(width = ExampleSize, color = lightGrey) {
-            Row(ExpandedWidth) {
+            Row(LayoutExpandedWidth) {
                 PurpleSquare()
                 CyanSquare()
             }
         }
-        Spacer(Height(24.dp))
+        Spacer(LayoutHeight(24.dp))
         ContainerWithBackground(width = ExampleSize, color = lightGrey) {
-            Row(ExpandedWidth) {
-                PurpleSquare(Gravity.Bottom)
-                CyanSquare(Gravity.Bottom)
+            Row(LayoutExpandedWidth) {
+                PurpleSquare(LayoutGravity.Bottom)
+                CyanSquare(LayoutGravity.Bottom)
             }
         }
-        Spacer(Height(24.dp))
+        Spacer(LayoutHeight(24.dp))
         Text(text = "Column", style = TextStyle(fontSize = 48.sp))
-        Row(ExpandedWidth) {
+        Row(LayoutExpandedWidth) {
             ContainerWithBackground(height = ExampleSize, color = lightGrey) {
-                Column(ExpandedHeight) {
+                Column(LayoutExpandedHeight) {
                     PurpleSquare()
                     CyanSquare()
                 }
             }
-            Spacer(Width(24.dp))
+            Spacer(LayoutWidth(24.dp))
             ContainerWithBackground(height = ExampleSize, color = lightGrey) {
-                Column(ExpandedHeight, arrangement = Arrangement.Center) {
+                Column(LayoutExpandedHeight, arrangement = Arrangement.Center) {
                     PurpleSquare()
                     CyanSquare()
                 }
             }
-            Spacer(Width(24.dp))
+            Spacer(LayoutWidth(24.dp))
             ContainerWithBackground(height = ExampleSize, color = lightGrey) {
-                Column(ExpandedHeight, arrangement = Arrangement.End) {
+                Column(LayoutExpandedHeight, arrangement = Arrangement.End) {
                     PurpleSquare()
                     CyanSquare()
                 }
             }
-            Spacer(Width(24.dp))
+            Spacer(LayoutWidth(24.dp))
             ContainerWithBackground(height = ExampleSize, color = lightGrey) {
-                Column(ExpandedHeight) {
+                Column(LayoutExpandedHeight) {
                     PurpleSquare()
                     CyanSquare()
                 }
             }
-            Spacer(Width(24.dp))
+            Spacer(LayoutWidth(24.dp))
             ContainerWithBackground(height = ExampleSize, color = lightGrey) {
-                Column(ExpandedHeight) {
-                    PurpleSquare(Gravity.End)
-                    CyanSquare(Gravity.End)
+                Column(LayoutExpandedHeight) {
+                    PurpleSquare(LayoutGravity.End)
+                    CyanSquare(LayoutGravity.End)
                 }
             }
         }

diff --git a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/AlignSample.kt b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/AlignSample.kt
index 69af541..c435d16 100644
--- a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/AlignSample.kt
+++ b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/AlignSample.kt

@@ -22,12 +22,12 @@
 import androidx.ui.core.dp
 import androidx.ui.graphics.Color
 import androidx.ui.layout.Align
-import androidx.ui.layout.Aligned
+import androidx.ui.layout.LayoutAlign
 import androidx.ui.layout.Center
 import androidx.ui.layout.Column
-import androidx.ui.layout.ExpandedHeight
-import androidx.ui.layout.ExpandedWidth
-import androidx.ui.layout.Gravity
+import androidx.ui.layout.LayoutExpandedHeight
+import androidx.ui.layout.LayoutExpandedWidth
+import androidx.ui.layout.LayoutGravity
 import androidx.ui.layout.Row
 
 @Sampled
@@ -49,49 +49,49 @@
 @Sampled
 @Composable
 fun SimpleAlignedModifier() {
-    SizedRectangle(modifier = Aligned.TopCenter, color = Color.Blue, width = 20.dp, height = 20.dp)
+    SizedRectangle(LayoutAlign.TopCenter, color = Color.Blue, width = 20.dp, height = 20.dp)
 }
 
 @Sampled
 @Composable
 fun SimpleVerticallyAlignedModifier() {
-    SizedRectangle(modifier = Aligned.CenterVertically, color = Color.Blue, height = 50.dp)
+    SizedRectangle(LayoutAlign.CenterVertically, color = Color.Blue, height = 50.dp)
 }
 
 @Sampled
 @Composable
 fun SimpleGravityInRow() {
-    Row(ExpandedHeight) {
+    Row(LayoutExpandedHeight) {
         // The child with no gravity modifier is positioned by default so that its top edge is
         // aligned to the top of the vertical axis.
         SizedRectangle(color = Color.Magenta, width = 80.dp, height = 40.dp)
         // Gravity.Top, the child will be positioned so that its top edge is aligned to the top
         // of the vertical axis.
-        SizedRectangle(Gravity.Top, color = Color.Red, width = 80.dp, height = 40.dp)
+        SizedRectangle(LayoutGravity.Top, color = Color.Red, width = 80.dp, height = 40.dp)
         // Gravity.Center, the child will be positioned so that its center is in the middle of
         // the vertical axis.
-        SizedRectangle(Gravity.Center, color = Color.Yellow, width = 80.dp, height = 40.dp)
+        SizedRectangle(LayoutGravity.Center, color = Color.Yellow, width = 80.dp, height = 40.dp)
         // Gravity.Bottom, the child will be positioned so that its bottom edge is aligned to the
         // bottom of the vertical axis.
-        SizedRectangle(Gravity.Bottom, color = Color.Green, width = 80.dp, height = 40.dp)
+        SizedRectangle(LayoutGravity.Bottom, color = Color.Green, width = 80.dp, height = 40.dp)
     }
 }
 
 @Sampled
 @Composable
 fun SimpleGravityInColumn() {
-    Column(ExpandedWidth) {
+    Column(LayoutExpandedWidth) {
         // The child with no gravity modifier is positioned by default so that its start edge
         // aligned with the start edge of the horizontal axis.
         SizedRectangle(color = Color.Magenta, width = 80.dp, height = 40.dp)
         // Gravity.Start, the child will be positioned so that its start edge is aligned with
         // the start edge of the horizontal axis.
-        SizedRectangle(Gravity.Start, color = Color.Red, width = 80.dp, height = 40.dp)
+        SizedRectangle(LayoutGravity.Start, color = Color.Red, width = 80.dp, height = 40.dp)
         // Gravity.Center, the child will be positioned so that its center is in the middle of
         // the horizontal axis.
-        SizedRectangle(Gravity.Center, color = Color.Yellow, width = 80.dp, height = 40.dp)
+        SizedRectangle(LayoutGravity.Center, color = Color.Yellow, width = 80.dp, height = 40.dp)
         // Gravity.End, the child will be positioned so that its end edge aligned to the end of
         // the horizontal axis.
-        SizedRectangle(Gravity.End, color = Color.Green, width = 80.dp, height = 40.dp)
+        SizedRectangle(LayoutGravity.End, color = Color.Green, width = 80.dp, height = 40.dp)
     }
 }
\ No newline at end of file

diff --git a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/AspectRatioSample.kt b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/AspectRatioSample.kt
index 930e0a0..55151bc 100644
--- a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/AspectRatioSample.kt
+++ b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/AspectRatioSample.kt

@@ -21,7 +21,7 @@
 import androidx.ui.core.dp
 import androidx.ui.foundation.ColoredRect
 import androidx.ui.graphics.Color
-import androidx.ui.layout.AspectRatio
+import androidx.ui.layout.LayoutAspectRatio
 import androidx.ui.layout.Container
 import androidx.ui.layout.DpConstraints
 
@@ -29,6 +29,6 @@
 @Composable
 fun SimpleAspectRatio() {
     Container(constraints = DpConstraints.tightConstraintsForWidth(100.dp)) {
-        ColoredRect(color = Color.Gray, modifier = AspectRatio(2f))
+        ColoredRect(color = Color.Gray, modifier = LayoutAspectRatio(2f))
     }
 }

diff --git a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/ExpandedModifierSample.kt b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/ExpandedModifierSample.kt
index f35731c..5417fdc 100644
--- a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/ExpandedModifierSample.kt
+++ b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/ExpandedModifierSample.kt

@@ -26,14 +26,14 @@
 import androidx.ui.graphics.Color
 import androidx.ui.layout.Align
 import androidx.ui.layout.Container
-import androidx.ui.layout.Expanded
-import androidx.ui.layout.ExpandedHeight
-import androidx.ui.layout.ExpandedWidth
+import androidx.ui.layout.LayoutExpanded
+import androidx.ui.layout.LayoutExpandedHeight
+import androidx.ui.layout.LayoutExpandedWidth
 
 @Sampled
 @Composable
 fun SimpleExpandedWidthModifier() {
-    Container(modifier = ExpandedWidth) {
+    Container(modifier = LayoutExpandedWidth) {
         DrawShape(RectangleShape, Color.Red)
         ColoredRect(color = Color.Magenta, width = 100.dp, height = 100.dp)
     }
@@ -43,7 +43,7 @@
 @Composable
 fun SimpleExpandedHeightModifier() {
     Align(alignment = Alignment.TopLeft) {
-        Container(modifier = ExpandedHeight) {
+        Container(modifier = LayoutExpandedHeight) {
             DrawShape(RectangleShape, Color.Red)
             ColoredRect(color = Color.Magenta, width = 100.dp, height = 100.dp)
         }
@@ -54,7 +54,7 @@
 @Composable
 fun SimpleExpandedModifier() {
     Align(alignment = Alignment.TopLeft) {
-        Container(modifier = Expanded) {
+        Container(modifier = LayoutExpanded) {
             DrawShape(RectangleShape, Color.Red)
             ColoredRect(color = Color.Magenta, width = 100.dp, height = 100.dp)
         }

diff --git a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/FlexSample.kt b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/FlexSample.kt
index bc02f20..232448f 100644
--- a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/FlexSample.kt
+++ b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/FlexSample.kt

@@ -26,10 +26,10 @@
 import androidx.ui.layout.Center
 import androidx.ui.layout.Column
 import androidx.ui.layout.Container
-import androidx.ui.layout.ExpandedHeight
+import androidx.ui.layout.LayoutExpandedHeight
 import androidx.ui.layout.FlexColumn
 import androidx.ui.layout.FlexRow
-import androidx.ui.layout.Gravity
+import androidx.ui.layout.LayoutGravity
 import androidx.ui.layout.Row
 import androidx.ui.text.TextStyle
 
@@ -77,11 +77,11 @@
         // size.
         SizedRectangle(color = Color.Magenta, width = 40.dp, height = 80.dp)
         // Inflexible, the child will have the specified size.
-        SizedRectangle(Inflexible, color = Color.Red, width = 80.dp, height = 40.dp)
+        SizedRectangle(LayoutInflexible, color = Color.Red, width = 80.dp, height = 40.dp)
         // Flexible, the child will occupy have of the remaining width.
-        SizedRectangle(Flexible(1f), color = Color.Yellow, height = 40.dp)
+        SizedRectangle(LayoutFlexible(1f), color = Color.Yellow, height = 40.dp)
         // Flexible not tight, the child will occupy at most half of the remaining width.
-        SizedRectangle(Flexible(1f, tight = false), color = Color.Green, height = 80.dp)
+        SizedRectangle(LayoutFlexible(1f, tight = false), color = Color.Green, height = 80.dp)
     }
 }
 
@@ -93,11 +93,11 @@
         // size.
         SizedRectangle(color = Color.Magenta, width = 40.dp, height = 80.dp)
         // Inflexible, the child will have the specified size.
-        SizedRectangle(Inflexible, color = Color.Red, width = 80.dp, height = 40.dp)
+        SizedRectangle(LayoutInflexible, color = Color.Red, width = 80.dp, height = 40.dp)
         // Flexible, the child will occupy have of the remaining height.
-        SizedRectangle(Flexible(1f), color = Color.Yellow, width = 40.dp)
+        SizedRectangle(LayoutFlexible(1f), color = Color.Yellow, width = 40.dp)
         // Flexible not tight, the child will occupy at most half of the remaining height.
-        SizedRectangle(Flexible(1f, tight = false), color = Color.Green, width = 80.dp)
+        SizedRectangle(LayoutFlexible(1f, tight = false), color = Color.Green, width = 80.dp)
     }
 }
 
@@ -108,19 +108,19 @@
         // Center of the first rectangle is aligned to the right edge of the second rectangle and
         // left edge of the third one.
         SizedRectangle(
-            Gravity.RelativeToSiblings { it.width * 0.5 },
+            LayoutGravity.RelativeToSiblings { it.width * 0.5 },
             color = Color.Blue,
             width = 80.dp,
             height = 40.dp
         )
         SizedRectangle(
-            Gravity.RelativeToSiblings { it.width },
+            LayoutGravity.RelativeToSiblings { it.width },
             color = Color.Magenta,
             width = 80.dp,
             height = 40.dp
         )
         SizedRectangle(
-            Gravity.RelativeToSiblings { 0.ipx },
+            LayoutGravity.RelativeToSiblings { 0.ipx },
             color = Color.Red,
             width = 80.dp,
             height = 40.dp
@@ -131,15 +131,15 @@
 @Sampled
 @Composable
 fun SimpleRelativeToSiblingsInRow() {
-    Row(ExpandedHeight) {
+    Row(LayoutExpandedHeight) {
         // Center of the colored rectangle is aligned to first baseline of the text.
         SizedRectangle(
             color = Color.Red,
             width = 80.dp,
             height = 40.dp,
-            modifier = Gravity.RelativeToSiblings { it.height * 0.5 }
+            modifier = LayoutGravity.RelativeToSiblings { it.height * 0.5 }
         )
-        Container(width = 80.dp, modifier = Gravity.RelativeToSiblings(FirstBaseline)) {
+        Container(width = 80.dp, modifier = LayoutGravity.RelativeToSiblings(FirstBaseline)) {
             Text(text = "Text.", style = TextStyle(background = Color.Cyan))
         }
     }
@@ -152,19 +152,19 @@
         // Center of the first rectangle is aligned to the right edge of the second rectangle and
         // left edge of the third one.
         SizedRectangle(
-            Gravity.RelativeToSiblings { it.width * 0.5 },
+            LayoutGravity.RelativeToSiblings { it.width * 0.5 },
             color = Color.Blue,
             width = 80.dp,
             height = 40.dp
         )
         SizedRectangleWithLines(
-            Gravity.RelativeToSiblings(End),
+            LayoutGravity.RelativeToSiblings(End),
             color = Color.Magenta,
             width = 80.dp,
             height = 40.dp
         )
         SizedRectangleWithLines(
-            Gravity.RelativeToSiblings(Start),
+            LayoutGravity.RelativeToSiblings(Start),
             color = Color.Red,
             width = 80.dp,
             height = 40.dp

diff --git a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/IntrinsicSample.kt b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/IntrinsicSample.kt
index 14f1f30..f4413f4 100644
--- a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/IntrinsicSample.kt
+++ b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/IntrinsicSample.kt

@@ -23,14 +23,14 @@
 import androidx.ui.foundation.shape.DrawShape
 import androidx.ui.foundation.shape.RectangleShape
 import androidx.ui.graphics.Color
-import androidx.ui.layout.AspectRatio
+import androidx.ui.layout.LayoutAspectRatio
 import androidx.ui.layout.Column
 import androidx.ui.layout.ConstrainedBox
 import androidx.ui.layout.Container
 import androidx.ui.layout.CrossAxisAlignment
 import androidx.ui.layout.DpConstraints
-import androidx.ui.layout.ExpandedHeight
-import androidx.ui.layout.ExpandedWidth
+import androidx.ui.layout.LayoutExpandedHeight
+import androidx.ui.layout.LayoutExpandedWidth
 import androidx.ui.layout.FlexRow
 import androidx.ui.layout.MaxIntrinsicHeight
 import androidx.ui.layout.MaxIntrinsicWidth
@@ -44,7 +44,7 @@
  * Here [MinIntrinsicWidth] is adding a speculative width measurement pass for the [Column],
  * whose minimum intrinsic width will correspond to the preferred width of the largest
  * [ConstrainedBox]. Then [MinIntrinsicWidth] will measure the [Column] with tight width, the same
- * as the premeasured minimum intrinsic width, which due to [ExpandedWidth] will force
+ * as the premeasured minimum intrinsic width, which due to [LayoutExpandedWidth] will force
  * the [ConstrainedBox]s to use the same width.
  */
 @Sampled
@@ -52,22 +52,22 @@
 fun SameWidthBoxes() {
     Wrap {
         MinIntrinsicWidth {
-            Column(ExpandedHeight) {
+            Column(LayoutExpandedHeight) {
                 ConstrainedBox(
                     constraints = DpConstraints.tightConstraints(width = 20.dp, height = 10.dp),
-                    modifier = ExpandedWidth
+                    modifier = LayoutExpandedWidth
                 ) {
                     DrawShape(RectangleShape, Color.Gray)
                 }
                 ConstrainedBox(
                     constraints = DpConstraints.tightConstraints(width = 30.dp, height = 10.dp),
-                    modifier = ExpandedWidth
+                    modifier = LayoutExpandedWidth
                 ) {
                     DrawShape(RectangleShape, Color.Blue)
                 }
                 ConstrainedBox(
                     constraints = DpConstraints.tightConstraints(width = 10.dp, height = 10.dp),
-                    modifier = ExpandedWidth
+                    modifier = LayoutExpandedWidth
                 ) {
                     DrawShape(RectangleShape, Color.Magenta)
                 }
@@ -113,7 +113,7 @@
  * Here [MaxIntrinsicWidth] is adding a speculative width measurement pass for the [Column],
  * whose maximum intrinsic width will correspond to the preferred width of the largest
  * [ConstrainedBox]. Then [MaxIntrinsicWidth] will measure the [Column] with tight width, the same
- * as the premeasured maximum intrinsic width, which due to [ExpandedWidth] modifiers will force
+ * as the premeasured maximum intrinsic width, which due to [LayoutExpandedWidth] modifiers will force
  * the [ConstrainedBox]s to use the same width.
  */
 @Sampled
@@ -121,16 +121,16 @@
 fun SameWidthTextBoxes() {
     Wrap {
         MaxIntrinsicWidth {
-            Column(ExpandedHeight) {
-                Container(ExpandedWidth) {
+            Column(LayoutExpandedHeight) {
+                Container(LayoutExpandedWidth) {
                     DrawShape(RectangleShape, Color.Gray)
                     Text("Short text")
                 }
-                Container(ExpandedWidth) {
+                Container(LayoutExpandedWidth) {
                     DrawShape(RectangleShape, Color.Blue)
                     Text("Extremely long text giving the width of its siblings")
                 }
-                Container(ExpandedWidth) {
+                Container(LayoutExpandedWidth) {
                     DrawShape(RectangleShape, Color.Magenta)
                     Text("Medium length text")
                 }
@@ -156,13 +156,13 @@
         MaxIntrinsicHeight {
             FlexRow(crossAxisAlignment = CrossAxisAlignment.Stretch) {
                 expanded(flex = 1f) {
-                    Container(AspectRatio(2f)) { DrawShape(RectangleShape, Color.Gray) }
+                    Container(LayoutAspectRatio(2f)) { DrawShape(RectangleShape, Color.Gray) }
                 }
                 inflexible {
                     Container(width = 1.dp) { DrawShape(RectangleShape, Color.Black) }
                 }
                 expanded(flex = 1f) {
-                    Container(AspectRatio(1f)) { DrawShape(RectangleShape, Color.Blue) }
+                    Container(LayoutAspectRatio(1f)) { DrawShape(RectangleShape, Color.Blue) }
                 }
             }
         }

diff --git a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/SpacingSample.kt b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/LayoutPaddingSample.kt
similarity index 92%
rename from ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/SpacingSample.kt
rename to ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/LayoutPaddingSample.kt
index 4dc05d3..37210ce5 100644
--- a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/SpacingSample.kt
+++ b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/LayoutPaddingSample.kt

@@ -24,17 +24,17 @@
 import androidx.ui.layout.Align
 import androidx.ui.layout.Container
 import androidx.ui.layout.EdgeInsets
+import androidx.ui.layout.LayoutPadding
 import androidx.ui.layout.Padding
-import androidx.ui.layout.Spacing
 
 @Sampled
 @Composable
-fun SpacingModifier() {
+fun LayoutPaddingModifier() {
     Align(Alignment.TopLeft) {
         Container {
             DrawRectangle(Color.Gray)
             SizedRectangle(
-                modifier = Spacing(
+                modifier = LayoutPadding(
                     left = 20.dp, top = 30.dp, right = 20.dp, bottom = 30.dp
                 ),
                 color = Color.Blue,
@@ -47,12 +47,12 @@
 
 @Sampled
 @Composable
-fun SpacingAllModifier() {
+fun LayoutPaddingAllModifier() {
     Align(Alignment.TopLeft) {
         Container {
             DrawRectangle(Color.Gray)
             SizedRectangle(
-                modifier = Spacing(all = 20.dp),
+                modifier = LayoutPadding(all = 20.dp),
                 color = Color.Blue,
                 width = 50.dp,
                 height = 50.dp

diff --git a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/SizeModifierSample.kt b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/SizeModifierSample.kt
index b6b6172..20e0ab5 100644
--- a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/SizeModifierSample.kt
+++ b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/SizeModifierSample.kt

@@ -22,18 +22,18 @@
 import androidx.ui.foundation.shape.DrawShape
 import androidx.ui.foundation.shape.RectangleShape
 import androidx.ui.graphics.Color
-import androidx.ui.layout.AspectRatio
+import androidx.ui.layout.LayoutAspectRatio
 import androidx.ui.layout.Center
 import androidx.ui.layout.Container
-import androidx.ui.layout.Height
-import androidx.ui.layout.Size
-import androidx.ui.layout.Width
+import androidx.ui.layout.LayoutHeight
+import androidx.ui.layout.LayoutSize
+import androidx.ui.layout.LayoutWidth
 
 @Sampled
 @Composable
 fun SimpleSizeModifier() {
     Center {
-        Container(modifier = Size(width = 100.dp, height = 100.dp)) {
+        Container(modifier = LayoutSize(width = 100.dp, height = 100.dp)) {
             DrawShape(shape = RectangleShape, color = Color.Red)
         }
     }
@@ -43,7 +43,7 @@
 @Composable
 fun SimpleWidthModifier() {
     Center {
-        Container(modifier = Width(100.dp) wraps AspectRatio(1f)) {
+        Container(modifier = LayoutWidth(100.dp) wraps LayoutAspectRatio(1f)) {
             DrawShape(shape = RectangleShape, color = Color.Magenta)
         }
     }
@@ -53,7 +53,7 @@
 @Composable
 fun SimpleHeightModifier() {
     Center {
-        Container(modifier = Height(100.dp) wraps AspectRatio(1f)) {
+        Container(modifier = LayoutHeight(100.dp) wraps LayoutAspectRatio(1f)) {
             DrawShape(shape = RectangleShape, color = Color.Blue)
         }
     }

diff --git a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/SpacerSample.kt b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/SpacerSample.kt
index bf8e38c..6a8ca70 100644
--- a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/SpacerSample.kt
+++ b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/SpacerSample.kt

@@ -22,16 +22,16 @@
 import androidx.ui.graphics.Color
 import androidx.ui.layout.Row
 import androidx.ui.layout.Spacer
-import androidx.ui.layout.Width
+import androidx.ui.layout.LayoutWidth
 
 @Sampled
 @Composable
 fun SpacerExample() {
     Row {
         SizedRectangle(color = Color.Red, width = 100.dp, height = 100.dp)
-        Spacer(modifier = Width(20.dp))
+        Spacer(modifier = LayoutWidth(20.dp))
         SizedRectangle(color = Color.Magenta, width = 100.dp, height = 100.dp)
-        Spacer(modifier = Flexible(1f))
+        Spacer(modifier = LayoutFlexible(1f))
         SizedRectangle(color = Color.Black, width = 100.dp, height = 100.dp)
     }
 }
\ No newline at end of file

diff --git a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/StackSample.kt b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/StackSample.kt
index 6f3f0d5..c662051 100644
--- a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/StackSample.kt
+++ b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/StackSample.kt

@@ -20,26 +20,26 @@
 import androidx.compose.Composable
 import androidx.ui.core.dp
 import androidx.ui.graphics.Color
-import androidx.ui.layout.Expanded
-import androidx.ui.layout.Gravity
-import androidx.ui.layout.Size
-import androidx.ui.layout.Spacing
+import androidx.ui.layout.LayoutExpanded
+import androidx.ui.layout.LayoutGravity
+import androidx.ui.layout.LayoutPadding
+import androidx.ui.layout.LayoutSize
 import androidx.ui.layout.Stack
 
 @Sampled
 @Composable
 fun SimpleStack() {
     Stack {
-        SizedRectangle(modifier = Expanded, color = Color.Cyan)
+        SizedRectangle(LayoutExpanded, color = Color.Cyan)
         SizedRectangle(
-            modifier = Gravity.Stretch wraps Spacing(top = 20.dp, bottom = 20.dp),
+            LayoutGravity.Stretch wraps LayoutPadding(top = 20.dp, bottom = 20.dp),
             color = Color.Yellow
         )
-        SizedRectangle(modifier = Gravity.Stretch wraps Spacing(40.dp), color = Color.Magenta)
-        SizedRectangle(modifier = Gravity.Center wraps Size(300.dp, 300.dp), color = Color.Green)
-        SizedRectangle(modifier = Gravity.TopLeft wraps Size(150.dp, 150.dp), color = Color.Red)
+        SizedRectangle(LayoutGravity.Stretch wraps LayoutPadding(40.dp), color = Color.Magenta)
+        SizedRectangle(LayoutGravity.Center wraps LayoutSize(300.dp, 300.dp), color = Color.Green)
+        SizedRectangle(LayoutGravity.TopLeft wraps LayoutSize(150.dp, 150.dp), color = Color.Red)
         SizedRectangle(
-            modifier = Gravity.BottomRight wraps Size(150.dp, 150.dp),
+            LayoutGravity.BottomRight wraps LayoutSize(150.dp, 150.dp),
             color = Color.Blue
         )
     }

diff --git a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/TableSample.kt b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/TableSample.kt
index d9fb082..8ecdd34 100644
--- a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/TableSample.kt
+++ b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/TableSample.kt

@@ -23,7 +23,7 @@
 import androidx.ui.foundation.shape.DrawShape
 import androidx.ui.foundation.shape.corner.CircleShape
 import androidx.ui.graphics.Color
-import androidx.ui.layout.AspectRatio
+import androidx.ui.layout.LayoutAspectRatio
 import androidx.ui.layout.Padding
 import androidx.ui.layout.Table
 import androidx.ui.layout.TableColumnWidth
@@ -104,5 +104,5 @@
 
 @Composable
 private fun SizedSquare(color: Color, size: Dp? = null) {
-    SizedRectangle(AspectRatio(1f), color = color, width = size)
+    SizedRectangle(LayoutAspectRatio(1f), color = color, width = size)
 }

diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/AlignTest.kt b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/AlignTest.kt
index 2de62fa..3cee391 100644
--- a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/AlignTest.kt
+++ b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/AlignTest.kt

@@ -32,12 +32,12 @@
 import androidx.ui.core.px
 import androidx.ui.core.withDensity
 import androidx.ui.layout.Align
-import androidx.ui.layout.Aligned
-import androidx.ui.layout.AspectRatio
+import androidx.ui.layout.LayoutAlign
+import androidx.ui.layout.LayoutAspectRatio
 import androidx.ui.layout.Container
-import androidx.ui.layout.ExpandedHeight
-import androidx.ui.layout.Size
-import androidx.ui.layout.Width
+import androidx.ui.layout.LayoutExpandedHeight
+import androidx.ui.layout.LayoutSize
+import androidx.ui.layout.LayoutWidth
 import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -105,7 +105,7 @@
                     position = alignPosition,
                     positionedLatch = positionedLatch
                 )
-                Container(modifier = Aligned.BottomRight wraps Size(sizeDp, sizeDp)) {
+                Container(modifier = LayoutAlign.BottomRight wraps LayoutSize(sizeDp, sizeDp)) {
                     SaveLayoutInfo(
                         size = childSize,
                         position = childPosition,
@@ -145,7 +145,7 @@
                     position = alignPosition,
                     positionedLatch = positionedLatch
                 )
-                Container(modifier = Aligned.End wraps ExpandedHeight wraps Width(sizeDp)) {
+                Container(LayoutAlign.End wraps LayoutExpandedHeight wraps LayoutWidth(sizeDp)) {
                     SaveLayoutInfo(
                         size = childSize,
                         position = childPosition,
@@ -233,7 +233,7 @@
                             position = alignPosition,
                             positionedLatch = positionedLatch
                         )
-                        Container(modifier = Aligned.BottomRight wraps Size(sizeDp, sizeDp)) {
+                        Container(LayoutAlign.BottomRight wraps LayoutSize(sizeDp, sizeDp)) {
                             SaveLayoutInfo(
                                 size = childSize,
                                 position = childPosition,
@@ -295,7 +295,7 @@
     fun testAlign_hasCorrectIntrinsicMeasurements() = withDensity(density) {
         testIntrinsics(@Composable {
             Align(alignment = Alignment.TopLeft) {
-                Container(AspectRatio(2f)) { }
+                Container(LayoutAspectRatio(2f)) { }
             }
         }) { minIntrinsicWidth, minIntrinsicHeight, maxIntrinsicWidth, maxIntrinsicHeight ->
             // Min width.
@@ -316,7 +316,7 @@
     @Test
     fun test2DAlignedModifier_hasCorrectIntrinsicMeasurements() = withDensity(density) {
         testIntrinsics(@Composable {
-            Container(Aligned.TopLeft wraps AspectRatio(2f)) { }
+            Container(LayoutAlign.TopLeft wraps LayoutAspectRatio(2f)) { }
         }) { minIntrinsicWidth, minIntrinsicHeight, maxIntrinsicWidth, maxIntrinsicHeight ->
             // Min width.
             assertEquals(0.ipx, minIntrinsicWidth(0.ipx))
@@ -343,7 +343,7 @@
     @Test
     fun test1DAlignedModifier_hasCorrectIntrinsicMeasurements() = withDensity(density) {
         testIntrinsics(@Composable {
-            Container(Aligned.CenterVertically wraps AspectRatio(2f)) { }
+            Container(LayoutAlign.CenterVertically wraps LayoutAspectRatio(2f)) { }
         }) { minIntrinsicWidth, minIntrinsicHeight, maxIntrinsicWidth, maxIntrinsicHeight ->
 
             // Min width.
@@ -463,13 +463,14 @@
         show {
             Layout(
                 children = {
-                    Container(Size(parentSize, parentSize)) {
+                    Container(LayoutSize(parentSize, parentSize)) {
                         SaveLayoutInfo(
                             size = alignSize,
                             position = alignPosition,
                             positionedLatch = positionedLatch
                         )
-                        Container(Aligned.BottomRight wraps Size(childSizeDp, childSizeDp)) {
+                        Container(LayoutAlign.BottomRight wraps
+                                LayoutSize(childSizeDp, childSizeDp)) {
                             SaveLayoutInfo(
                                 size = childSize,
                                 position = childPosition,

diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/AspectRatioModifierTest.kt b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/AspectRatioModifierTest.kt
index e1a5d43..ef08953 100644
--- a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/AspectRatioModifierTest.kt
+++ b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/AspectRatioModifierTest.kt

@@ -29,7 +29,7 @@
 import androidx.ui.core.px
 import androidx.ui.core.withDensity
 import androidx.ui.layout.Container
-import androidx.ui.layout.AspectRatio
+import androidx.ui.layout.LayoutAspectRatio
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
@@ -43,7 +43,7 @@
     @Test
     fun testAspectRatioModifier_intrinsicDimensions() = withDensity(density) {
         testIntrinsics(@Composable {
-            Container(modifier = AspectRatio(2f), width = 30.dp, height = 40.dp) { }
+            Container(modifier = LayoutAspectRatio(2f), width = 30.dp, height = 40.dp) { }
         }) { minIntrinsicWidth, minIntrinsicHeight, maxIntrinsicWidth, maxIntrinsicHeight ->
             assertEquals(40.ipx, minIntrinsicWidth(20.ipx))
             assertEquals(40.ipx, maxIntrinsicWidth(20.ipx))
@@ -60,14 +60,14 @@
     @Test(expected = IllegalArgumentException::class)
     fun testAspectRatioModifier_zeroRatio() {
         show {
-            Container(AspectRatio(0f)) { }
+            Container(LayoutAspectRatio(0f)) { }
         }
     }
 
     @Test(expected = IllegalArgumentException::class)
     fun testAspectRatioModifier_negativeRatio() {
         show {
-            Container(AspectRatio(-2f)) { }
+            Container(LayoutAspectRatio(-2f)) { }
         }
     }
 
@@ -99,7 +99,7 @@
         val position = Ref<PxPosition>()
         show {
             Layout(@Composable {
-                Container(AspectRatio(aspectRatio)) {
+                Container(LayoutAspectRatio(aspectRatio)) {
                     SaveLayoutInfo(size, position, positionedLatch)
                 }
             }) { measurables, incomingConstraints ->

diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/ConstrainedBoxTest.kt b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/ConstrainedBoxTest.kt
index b2ab6ed..4c9e899 100644
--- a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/ConstrainedBoxTest.kt
+++ b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/ConstrainedBoxTest.kt

@@ -28,7 +28,7 @@
 import androidx.ui.core.px
 import androidx.ui.core.withDensity
 import androidx.ui.layout.Align
-import androidx.ui.layout.AspectRatio
+import androidx.ui.layout.LayoutAspectRatio
 import androidx.ui.layout.ConstrainedBox
 import androidx.ui.layout.Container
 import androidx.ui.layout.DpConstraints
@@ -141,7 +141,7 @@
     fun testConstrainedBox_hasCorrectIntrinsicMeasurements() = withDensity(density) {
         testIntrinsics(@Composable {
             ConstrainedBox(constraints = DpConstraints(10.dp, 20.dp, 30.dp, 40.dp)) {
-                Container(AspectRatio(1f)) { }
+                Container(LayoutAspectRatio(1f)) { }
             }
         }) { minIntrinsicWidth, minIntrinsicHeight, maxIntrinsicWidth, maxIntrinsicHeight ->
             // Min width.

diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/ContainerTest.kt b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/ContainerTest.kt
index 7d233a9..c980823f 100644
--- a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/ContainerTest.kt
+++ b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/ContainerTest.kt

@@ -36,7 +36,7 @@
 import androidx.ui.layout.Container
 import androidx.ui.layout.DpConstraints
 import androidx.ui.layout.EdgeInsets
-import androidx.ui.layout.Size
+import androidx.ui.layout.LayoutSize
 import androidx.ui.layout.Spacer
 import androidx.ui.layout.Row
 import androidx.ui.layout.Wrap
@@ -311,7 +311,7 @@
         show {
             Wrap {
                 Container(padding = edgeInsets) {
-                    Spacer(Size(width = childSizeDp, height = childSizeDp))
+                    Spacer(LayoutSize(width = childSizeDp, height = childSizeDp))
                     OnPositioned( coordinates ->
                         containerSize = coordinates.size
                         latch.countDown()
@@ -340,7 +340,7 @@
                         childCoordinates = coordinates
                         latch.countDown()
                     }) {
-                        Spacer(Size(width = childSize, height = childSize))
+                        Spacer(LayoutSize(width = childSize, height = childSize))
                     }
                 }
             }

diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/ExpandedModifierTest.kt b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/ExpandedModifierTest.kt
index e0edb23..9390a83 100644
--- a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/ExpandedModifierTest.kt
+++ b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/ExpandedModifierTest.kt

@@ -33,11 +33,11 @@
 import androidx.ui.core.withDensity
 import androidx.ui.engine.geometry.Rect
 import androidx.ui.layout.Align
-import androidx.ui.layout.AspectRatio
+import androidx.ui.layout.LayoutAspectRatio
 import androidx.ui.layout.Container
-import androidx.ui.layout.Expanded
-import androidx.ui.layout.ExpandedHeight
-import androidx.ui.layout.ExpandedWidth
+import androidx.ui.layout.LayoutExpanded
+import androidx.ui.layout.LayoutExpandedHeight
+import androidx.ui.layout.LayoutExpandedWidth
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -63,23 +63,23 @@
         )
         Assert.assertEquals(
             Rect(0f, 0f, screenWidth, Height.toIntPx().value.toFloat()),
-            getSize(ExpandedWidth).toRect()
+            getSize(LayoutExpandedWidth).toRect()
         )
         Assert.assertEquals(
             Rect(0f, 0f, Width.toIntPx().value.toFloat(), screenHeight),
-            getSize(ExpandedHeight).toRect()
+            getSize(LayoutExpandedHeight).toRect()
         )
         Assert.assertEquals(
             Rect(0f, 0f, screenWidth, screenHeight),
-            getSize(Expanded).toRect()
+            getSize(LayoutExpanded).toRect()
         )
     }
 
     @Test
     fun testExpandedModifier_noChangeIntrinsicMeasurements() = withDensity(density) {
-        verifyIntrinsicMeasurements(ExpandedWidth)
-        verifyIntrinsicMeasurements(ExpandedHeight)
-        verifyIntrinsicMeasurements(Expanded)
+        verifyIntrinsicMeasurements(LayoutExpandedWidth)
+        verifyIntrinsicMeasurements(LayoutExpandedHeight)
+        verifyIntrinsicMeasurements(LayoutExpanded)
     }
 
     private fun getSize(modifier: Modifier = Modifier.None): PxSize {
@@ -112,7 +112,8 @@
     private fun verifyIntrinsicMeasurements(expandedModifier: Modifier) = withDensity(density) {
         // intrinsic measurements do not change with the ExpandedModifier
         testIntrinsics(@Composable {
-            Container(expandedModifier wraps AspectRatio(2f), width = 30.dp, height = 40.dp) { }
+            Container(expandedModifier wraps LayoutAspectRatio(2f),
+                width = 30.dp, height = 40.dp) { }
         }) { minIntrinsicWidth, minIntrinsicHeight, maxIntrinsicWidth, maxIntrinsicHeight ->
             // Width
             assertEquals(40.ipx, minIntrinsicWidth(20.ipx))

diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/FlexTest.kt b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/FlexTest.kt
index ac79d36..5f80ccf 100644
--- a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/FlexTest.kt
+++ b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/FlexTest.kt

@@ -49,17 +49,17 @@
 import androidx.ui.core.min
 import androidx.ui.layout.Align
 import androidx.ui.layout.Arrangement
-import androidx.ui.layout.AspectRatio
+import androidx.ui.layout.LayoutAspectRatio
 import androidx.ui.layout.Center
 import androidx.ui.layout.Column
 import androidx.ui.layout.Container
-import androidx.ui.layout.ExpandedHeight
-import androidx.ui.layout.ExpandedWidth
+import androidx.ui.layout.LayoutExpandedHeight
+import androidx.ui.layout.LayoutExpandedWidth
 import androidx.ui.layout.FlexColumn
 import androidx.ui.layout.FlexRow
-import androidx.ui.layout.Gravity
+import androidx.ui.layout.LayoutGravity
 import androidx.ui.layout.Row
-import androidx.ui.layout.Size
+import androidx.ui.layout.LayoutSize
 import androidx.ui.layout.Spacer
 import androidx.ui.layout.Wrap
 import org.junit.Assert
@@ -131,7 +131,7 @@
         show {
             Container(alignment = Alignment.TopLeft) {
                 Row {
-                    Container(Flexible(1f), width = width, height = height) {
+                    Container(LayoutFlexible(1f), width = width, height = height) {
                         OnPositioned( coordinates ->
                             childSize[0] = coordinates.size
                             childPosition[0] = coordinates.localToGlobal(PxPosition(0.px, 0.px))
@@ -139,7 +139,7 @@
                         })
                     }
 
-                    Container(Flexible(2f), width = width, height = height) {
+                    Container(LayoutFlexible(2f), width = width, height = height) {
                         OnPositioned( coordinates ->
                             childSize[1] = coordinates.size
                             childPosition[1] = coordinates.localToGlobal(PxPosition(0.px, 0.px))
@@ -181,7 +181,7 @@
             Container(alignment = Alignment.TopLeft) {
                 Row {
                     Container(
-                        Flexible(1f, tight = false),
+                        LayoutFlexible(1f, tight = false),
                         width = width,
                         height = height
                     ) {
@@ -193,7 +193,7 @@
                     }
 
                     Container(
-                        Flexible(2f, tight = false),
+                        LayoutFlexible(2f, tight = false),
                         width = width,
                         height = height * 2
                     ) {
@@ -374,7 +374,7 @@
         show {
             Container(alignment = Alignment.TopLeft) {
                 Column {
-                    Container(Flexible(1f), width = width, height = height) {
+                    Container(LayoutFlexible(1f), width = width, height = height) {
                         OnPositioned( coordinates ->
                             childSize[0] = coordinates.size
                             childPosition[0] = coordinates.localToGlobal(PxPosition(0.px, 0.px))
@@ -382,7 +382,7 @@
                         })
                     }
 
-                    Container(Flexible(2f), width = width, height = height) {
+                    Container(LayoutFlexible(2f), width = width, height = height) {
                         OnPositioned( coordinates ->
                             childSize[1] = coordinates.size
                             childPosition[1] = coordinates.localToGlobal(PxPosition(0.px, 0.px))
@@ -421,14 +421,14 @@
         show {
             Container(alignment = Alignment.TopLeft) {
                 Column {
-                    Container(Flexible(1f, tight = false), width = width, height = height) {
+                    Container(LayoutFlexible(1f, tight = false), width = width, height = height) {
                         OnPositioned( coordinates ->
                             childSize[0] = coordinates.size
                             childPosition[0] = coordinates.localToGlobal(PxPosition(0.px, 0.px))
                             drawLatch.countDown()
                         })
                     }
-                    Container(Flexible(2f, tight = false), width = width, height = height) {
+                    Container(LayoutFlexible(2f, tight = false), width = width, height = height) {
                         OnPositioned( coordinates ->
                             childSize[1] = coordinates.size
                             childPosition[1] = coordinates.localToGlobal(PxPosition(0.px, 0.px))
@@ -565,7 +565,7 @@
         show {
             Align(Alignment.CenterLeft) {
                 Row {
-                    Container(width = sizeDp, height = sizeDp, modifier = ExpandedHeight) {
+                    Container(width = sizeDp, height = sizeDp, modifier = LayoutExpandedHeight) {
                         OnPositioned( coordinates ->
                             childSize[0] = coordinates.size
                             childPosition[0] = coordinates.localToGlobal(PxPosition(0.px, 0.px))
@@ -576,7 +576,7 @@
                     Container(
                         width = (sizeDp * 2),
                         height = (sizeDp * 2),
-                        modifier = ExpandedHeight
+                        modifier = LayoutExpandedHeight
                     ) {
                         OnPositioned( coordinates ->
                             childSize[1] = coordinates.size
@@ -611,22 +611,22 @@
         val childPosition = arrayOfNulls<PxPosition>(3)
         show {
             Align(Alignment.TopLeft) {
-                Row(ExpandedHeight) {
-                    Container(width = sizeDp, height = sizeDp, modifier = Gravity.Top) {
+                Row(LayoutExpandedHeight) {
+                    Container(width = sizeDp, height = sizeDp, modifier = LayoutGravity.Top) {
                         OnPositioned( coordinates ->
                             childSize[0] = coordinates.size
                             childPosition[0] = coordinates.globalPosition
                             drawLatch.countDown()
                         })
                     }
-                    Container(width = sizeDp, height = sizeDp, modifier = Gravity.Center) {
+                    Container(width = sizeDp, height = sizeDp, modifier = LayoutGravity.Center) {
                         OnPositioned( coordinates ->
                             childSize[1] = coordinates.size
                             childPosition[1] = coordinates.globalPosition
                             drawLatch.countDown()
                         })
                     }
-                    Container(width = sizeDp, height = sizeDp, modifier = Gravity.Bottom) {
+                    Container(width = sizeDp, height = sizeDp, modifier = LayoutGravity.Bottom) {
                         OnPositioned( coordinates ->
                             childSize[2] = coordinates.size
                             childPosition[2] = coordinates.globalPosition
@@ -669,12 +669,12 @@
         val childPosition = arrayOfNulls<PxPosition>(4)
         show {
             Align(Alignment.TopLeft) {
-                Row(ExpandedHeight) {
+                Row(LayoutExpandedHeight) {
                     BaselineTestLayout(
                         baseline = baseline1Dp,
                         width = sizeDp,
                         height = sizeDp,
-                        modifier = Gravity.RelativeToSiblings(TestHorizontalLine)
+                        modifier = LayoutGravity.RelativeToSiblings(TestHorizontalLine)
                     ) {
                         OnPositioned( coordinates ->
                             childSize[0] = coordinates.size
@@ -685,7 +685,7 @@
                     Container(
                         width = sizeDp,
                         height = sizeDp,
-                        modifier = Gravity.RelativeToSiblings { it.height * 0.5 }
+                        modifier = LayoutGravity.RelativeToSiblings { it.height * 0.5 }
                     ) {
                         OnPositioned( coordinates ->
                             childSize[1] = coordinates.size
@@ -697,7 +697,7 @@
                         baseline = baseline2Dp,
                         width = sizeDp,
                         height = sizeDp,
-                        modifier = Gravity.RelativeToSiblings(TestHorizontalLine)
+                        modifier = LayoutGravity.RelativeToSiblings(TestHorizontalLine)
                     ) {
                         OnPositioned( coordinates ->
                             childSize[2] = coordinates.size
@@ -708,7 +708,7 @@
                     Container(
                         width = sizeDp,
                         height = sizeDp,
-                        modifier = Gravity.RelativeToSiblings { it.height * 0.75 }
+                        modifier = LayoutGravity.RelativeToSiblings { it.height * 0.75 }
                     ) {
                         OnPositioned( coordinates ->
                             childSize[3] = coordinates.size
@@ -756,7 +756,7 @@
         show {
             Align(Alignment.TopCenter) {
                 Column {
-                    Container(width = sizeDp, height = sizeDp, modifier = ExpandedWidth) {
+                    Container(width = sizeDp, height = sizeDp, modifier = LayoutExpandedWidth) {
                         OnPositioned( coordinates ->
                             childSize[0] = coordinates.size
                             childPosition[0] = coordinates.localToGlobal(PxPosition(0.px, 0.px))
@@ -765,7 +765,7 @@
                     }
 
                     Container(
-                        width = (sizeDp * 2), height = (sizeDp * 2), modifier = ExpandedWidth
+                        width = (sizeDp * 2), height = (sizeDp * 2), modifier = LayoutExpandedWidth
                     ) {
                         OnPositioned( coordinates ->
                             childSize[1] = coordinates.size
@@ -800,22 +800,22 @@
         val childPosition = arrayOfNulls<PxPosition>(3)
         show {
             Align(Alignment.TopCenter) {
-                Column(ExpandedWidth) {
-                    Container(width = sizeDp, height = sizeDp, modifier = Gravity.Start) {
+                Column(LayoutExpandedWidth) {
+                    Container(width = sizeDp, height = sizeDp, modifier = LayoutGravity.Start) {
                         OnPositioned( coordinates ->
                             childSize[0] = coordinates.size
                             childPosition[0] = coordinates.globalPosition
                             drawLatch.countDown()
                         })
                     }
-                    Container(width = sizeDp, height = sizeDp, modifier = Gravity.Center) {
+                    Container(width = sizeDp, height = sizeDp, modifier = LayoutGravity.Center) {
                         OnPositioned( coordinates ->
                             childSize[1] = coordinates.size
                             childPosition[1] = coordinates.globalPosition
                             drawLatch.countDown()
                         })
                     }
-                    Container(width = sizeDp, height = sizeDp, modifier = Gravity.End) {
+                    Container(width = sizeDp, height = sizeDp, modifier = LayoutGravity.End) {
                         OnPositioned( coordinates ->
                             childSize[2] = coordinates.size
                             childPosition[2] = coordinates.globalPosition
@@ -856,11 +856,11 @@
         val childPosition = arrayOfNulls<PxPosition>(4)
         show {
             Align(Alignment.TopLeft) {
-                Column(ExpandedWidth) {
+                Column(LayoutExpandedWidth) {
                     Container(
                         width = sizeDp,
                         height = sizeDp,
-                        modifier = Gravity.RelativeToSiblings { it.width }
+                        modifier = LayoutGravity.RelativeToSiblings { it.width }
                     ) {
                         OnPositioned( coordinates ->
                             childSize[0] = coordinates.size
@@ -871,7 +871,7 @@
                     Container(
                         width = sizeDp,
                         height = sizeDp,
-                        modifier = Gravity.RelativeToSiblings { 0.ipx }
+                        modifier = LayoutGravity.RelativeToSiblings { 0.ipx }
                     ) {
                         OnPositioned( coordinates ->
                             childSize[1] = coordinates.size
@@ -883,7 +883,7 @@
                         width = sizeDp,
                         height = sizeDp,
                         baseline = firstBaseline1Dp,
-                        modifier = Gravity.RelativeToSiblings(TestVerticalLine)
+                        modifier = LayoutGravity.RelativeToSiblings(TestVerticalLine)
                     ) {
                         OnPositioned( coordinates ->
                             childSize[2] = coordinates.size
@@ -895,7 +895,7 @@
                         width = sizeDp,
                         height = sizeDp,
                         baseline = firstBaseline2Dp,
-                        modifier = Gravity.RelativeToSiblings(TestVerticalLine)
+                        modifier = LayoutGravity.RelativeToSiblings(TestVerticalLine)
                     ) {
                         OnPositioned( coordinates ->
                             childSize[3] = coordinates.size
@@ -937,9 +937,9 @@
         lateinit var rowSize: PxSize
         show {
             Center {
-                Row(ExpandedWidth) {
-                    Spacer(Size(width = sizeDp, height = sizeDp))
-                    Spacer(Size(width = (sizeDp * 2), height = (sizeDp * 2)))
+                Row(LayoutExpandedWidth) {
+                    Spacer(LayoutSize(width = sizeDp, height = sizeDp))
+                    Spacer(LayoutSize(width = (sizeDp * 2), height = (sizeDp * 2)))
 
                     OnPositioned( coordinates ->
                         rowSize = coordinates.size
@@ -968,8 +968,8 @@
         show {
             Center {
                 Row {
-                    Spacer(Size(width = sizeDp, height = sizeDp))
-                    Spacer(Size(width = (sizeDp * 2), height = (sizeDp * 2)))
+                    Spacer(LayoutSize(width = sizeDp, height = sizeDp))
+                    Spacer(LayoutSize(width = (sizeDp * 2), height = (sizeDp * 2)))
 
                     OnPositioned( coordinates ->
                         rowSize = coordinates.size
@@ -998,7 +998,7 @@
         show {
             Center {
                 Row {
-                    Container(Flexible(1f), width = sizeDp, height = sizeDp) {}
+                    Container(LayoutFlexible(1f), width = sizeDp, height = sizeDp) {}
                     Container(width = (sizeDp * 2), height = (sizeDp * 2)) {}
 
                     OnPositioned( coordinates ->
@@ -1027,9 +1027,9 @@
         lateinit var rowSize: PxSize
         show {
             Center {
-                Row(ExpandedHeight) {
-                    Spacer(Size(width = sizeDp, height = sizeDp))
-                    Spacer(Size(width = (sizeDp * 2), height = (sizeDp * 2)))
+                Row(LayoutExpandedHeight) {
+                    Spacer(LayoutSize(width = sizeDp, height = sizeDp))
+                    Spacer(LayoutSize(width = (sizeDp * 2), height = (sizeDp * 2)))
 
                     OnPositioned( coordinates ->
                         rowSize = coordinates.size
@@ -1058,8 +1058,8 @@
         show {
             Center {
                 Row {
-                    Spacer(Size(width = sizeDp, height = sizeDp))
-                    Spacer(Size(width = (sizeDp * 2), height = (sizeDp * 2)))
+                    Spacer(LayoutSize(width = sizeDp, height = sizeDp))
+                    Spacer(LayoutSize(width = (sizeDp * 2), height = (sizeDp * 2)))
 
                     OnPositioned( coordinates ->
                         rowSize = coordinates.size
@@ -1089,9 +1089,9 @@
         show {
             Center {
                 ConstrainedBox(constraints = DpConstraints(maxWidth = rowWidthDp)) {
-                    Row(ExpandedWidth) {
-                        Spacer(Size(width = sizeDp, height = sizeDp))
-                        Spacer(Size(width = sizeDp * 2, height = sizeDp * 2))
+                    Row(LayoutExpandedWidth) {
+                        Spacer(LayoutSize(width = sizeDp, height = sizeDp))
+                        Spacer(LayoutSize(width = sizeDp * 2, height = sizeDp * 2))
 
                         OnPositioned( coordinates ->
                             rowSize = coordinates.size
@@ -1123,7 +1123,7 @@
             Center {
                 ConstrainedBox(constraints = DpConstraints(maxWidth = rowWidthDp)) {
                     Row {
-                        Container(Flexible(1f), width = sizeDp, height = sizeDp) {}
+                        Container(LayoutFlexible(1f), width = sizeDp, height = sizeDp) {}
                         Container(width = sizeDp * 2, height = sizeDp * 2) {}
 
                         OnPositioned( coordinates ->
@@ -1156,8 +1156,8 @@
             Center {
                 ConstrainedBox(constraints = DpConstraints(minWidth = rowWidthDp)) {
                     Row {
-                        Spacer(Size(width = sizeDp, height = sizeDp))
-                        Spacer(Size(width = sizeDp * 2, height = sizeDp * 2))
+                        Spacer(LayoutSize(width = sizeDp, height = sizeDp))
+                        Spacer(LayoutSize(width = sizeDp * 2, height = sizeDp * 2))
 
                         OnPositioned( coordinates ->
                             rowSize = coordinates.size
@@ -1188,9 +1188,9 @@
         show {
             Center {
                 ConstrainedBox(constraints = DpConstraints(maxHeight = rowHeightDp)) {
-                    Row(ExpandedHeight) {
-                        Spacer(Size(width = sizeDp, height = sizeDp))
-                        Spacer(Size(width = sizeDp * 2, height = sizeDp * 2))
+                    Row(LayoutExpandedHeight) {
+                        Spacer(LayoutSize(width = sizeDp, height = sizeDp))
+                        Spacer(LayoutSize(width = sizeDp * 2, height = sizeDp * 2))
 
                         OnPositioned( coordinates ->
                             rowSize = coordinates.size
@@ -1222,8 +1222,8 @@
             Center {
                 ConstrainedBox(constraints = DpConstraints(minHeight = rowHeightDp)) {
                     Row {
-                        Spacer(Size(width = sizeDp, height = sizeDp))
-                        Spacer(Size(width = sizeDp * 2, height = sizeDp * 2))
+                        Spacer(LayoutSize(width = sizeDp, height = sizeDp))
+                        Spacer(LayoutSize(width = sizeDp * 2, height = sizeDp * 2))
 
                         OnPositioned( coordinates ->
                             rowSize = coordinates.size
@@ -1310,7 +1310,7 @@
                             Assert.assertEquals(Constraints(), constraints)
                             FixedSizeLayout(inflexibleChildWidth.toIntPx(), 0.ipx, mapOf())
                         }
-                        Layout({}, Flexible(1f)) { _, constraints ->
+                        Layout({}, LayoutFlexible(1f)) { _, constraints ->
                             Assert.assertEquals(
                                 rowMinWidth.toIntPx() - inflexibleChildWidth.toIntPx() * 2,
                                 constraints.minWidth
@@ -1385,9 +1385,9 @@
         lateinit var columnSize: PxSize
         show {
             Center {
-                Column(ExpandedHeight) {
-                    Spacer(Size(width = sizeDp, height = sizeDp))
-                    Spacer(Size(width = (sizeDp * 2), height = (sizeDp * 2)))
+                Column(LayoutExpandedHeight) {
+                    Spacer(LayoutSize(width = sizeDp, height = sizeDp))
+                    Spacer(LayoutSize(width = (sizeDp * 2), height = (sizeDp * 2)))
 
                     OnPositioned( coordinates ->
                         columnSize = coordinates.size
@@ -1416,8 +1416,8 @@
         show {
             Center {
                 Column {
-                    Spacer(Size(width = sizeDp, height = sizeDp))
-                    Spacer(Size(width = (sizeDp * 2), height = (sizeDp * 2)))
+                    Spacer(LayoutSize(width = sizeDp, height = sizeDp))
+                    Spacer(LayoutSize(width = (sizeDp * 2), height = (sizeDp * 2)))
 
                     OnPositioned( coordinates ->
                         columnSize = coordinates.size
@@ -1446,7 +1446,7 @@
         show {
             Center {
                 Column {
-                    Container(Flexible(1f), width = sizeDp, height = sizeDp) {}
+                    Container(LayoutFlexible(1f), width = sizeDp, height = sizeDp) {}
                     Container(width = (sizeDp * 2), height = (sizeDp * 2)) {}
 
                     OnPositioned( coordinates ->
@@ -1475,9 +1475,9 @@
         lateinit var columnSize: PxSize
         show {
             Center {
-                Column(ExpandedWidth) {
-                    Spacer(Size(width = sizeDp, height = sizeDp))
-                    Spacer(Size(width = (sizeDp * 2), height = (sizeDp * 2)))
+                Column(LayoutExpandedWidth) {
+                    Spacer(LayoutSize(width = sizeDp, height = sizeDp))
+                    Spacer(LayoutSize(width = (sizeDp * 2), height = (sizeDp * 2)))
 
                     OnPositioned( coordinates ->
                         columnSize = coordinates.size
@@ -1506,8 +1506,8 @@
         show {
             Center {
                 Column {
-                    Spacer(Size(width = sizeDp, height = sizeDp))
-                    Spacer(Size(width = (sizeDp * 2), height = (sizeDp * 2)))
+                    Spacer(LayoutSize(width = sizeDp, height = sizeDp))
+                    Spacer(LayoutSize(width = (sizeDp * 2), height = (sizeDp * 2)))
 
                     OnPositioned( coordinates ->
                         columnSize = coordinates.size
@@ -1537,9 +1537,9 @@
         show {
             Center {
                 ConstrainedBox(constraints = DpConstraints(maxHeight = columnHeightDp)) {
-                    Column(ExpandedHeight) {
-                        Spacer(Size(width = sizeDp, height = sizeDp))
-                        Spacer(Size(width = sizeDp * 2, height = sizeDp * 2))
+                    Column(LayoutExpandedHeight) {
+                        Spacer(LayoutSize(width = sizeDp, height = sizeDp))
+                        Spacer(LayoutSize(width = sizeDp * 2, height = sizeDp * 2))
 
                         OnPositioned( coordinates ->
                             columnSize = coordinates.size
@@ -1571,7 +1571,7 @@
             Center {
                 ConstrainedBox(constraints = DpConstraints(maxHeight = columnHeightDp)) {
                     Column {
-                        Container(Flexible(1f), width = sizeDp, height = sizeDp) {}
+                        Container(LayoutFlexible(1f), width = sizeDp, height = sizeDp) {}
                         Container(width = sizeDp * 2, height = sizeDp * 2) {}
 
                         OnPositioned( coordinates ->
@@ -1604,8 +1604,8 @@
             Center {
                 ConstrainedBox(constraints = DpConstraints(minHeight = columnHeightDp)) {
                     Column {
-                        Spacer(Size(width = sizeDp, height = sizeDp))
-                        Spacer(Size(width = sizeDp * 2, height = sizeDp * 2))
+                        Spacer(LayoutSize(width = sizeDp, height = sizeDp))
+                        Spacer(LayoutSize(width = sizeDp * 2, height = sizeDp * 2))
 
                         OnPositioned( coordinates ->
                             columnSize = coordinates.size
@@ -1636,9 +1636,9 @@
         show {
             Center {
                 ConstrainedBox(constraints = DpConstraints(maxWidth = columnWidthDp)) {
-                    Column(ExpandedWidth) {
-                        Spacer(Size(width = sizeDp, height = sizeDp))
-                        Spacer(Size(width = sizeDp * 2, height = sizeDp * 2))
+                    Column(LayoutExpandedWidth) {
+                        Spacer(LayoutSize(width = sizeDp, height = sizeDp))
+                        Spacer(LayoutSize(width = sizeDp * 2, height = sizeDp * 2))
 
                         OnPositioned( coordinates ->
                             columnSize = coordinates.size
@@ -1670,8 +1670,8 @@
             Center {
                 ConstrainedBox(constraints = DpConstraints(minWidth = columnWidthDp)) {
                     Column {
-                        Spacer(Size(width = sizeDp, height = sizeDp))
-                        Spacer(Size(width = sizeDp * 2, height = sizeDp * 2))
+                        Spacer(LayoutSize(width = sizeDp, height = sizeDp))
+                        Spacer(LayoutSize(width = sizeDp * 2, height = sizeDp * 2))
 
                         OnPositioned( coordinates ->
                             columnSize = coordinates.size
@@ -1759,7 +1759,7 @@
                             Assert.assertEquals(Constraints(), constraints)
                             FixedSizeLayout(0.ipx, inflexibleChildHeight.toIntPx(), mapOf())
                         }
-                        Layout({}, Flexible(1f)) { _, constraints ->
+                        Layout({}, LayoutFlexible(1f)) { _, constraints ->
                             assertEquals(
                                 columnMinHeight.toIntPx() - inflexibleChildHeight.toIntPx() * 2,
                                 constraints.minHeight
@@ -1837,7 +1837,7 @@
         val childLayoutCoordinates = arrayOfNulls<LayoutCoordinates?>(childPosition.size)
         show {
             Center {
-                Row(ExpandedWidth) {
+                Row(LayoutExpandedWidth) {
                     for (i in 0 until childPosition.size) {
                         Container(width = sizeDp, height = sizeDp) {
                             OnPositioned( coordinates ->
@@ -1878,7 +1878,7 @@
         val childLayoutCoordinates = arrayOfNulls<LayoutCoordinates?>(childPosition.size)
         show {
             Center {
-                Row(ExpandedWidth, arrangement = Arrangement.End) {
+                Row(LayoutExpandedWidth, arrangement = Arrangement.End) {
                     for (i in 0 until childPosition.size) {
                         Container(width = sizeDp, height = sizeDp) {
                             OnPositioned( coordinates ->
@@ -1919,7 +1919,7 @@
         val childLayoutCoordinates = arrayOfNulls<LayoutCoordinates?>(childPosition.size)
         show {
             Center {
-                Row(ExpandedWidth, arrangement = Arrangement.Center) {
+                Row(LayoutExpandedWidth, arrangement = Arrangement.Center) {
                     for (i in 0 until childPosition.size) {
                         Container(width = sizeDp, height = sizeDp) {
                             OnPositioned( coordinates ->
@@ -1961,7 +1961,7 @@
         val childLayoutCoordinates = arrayOfNulls<LayoutCoordinates?>(childPosition.size)
         show {
             Center {
-                Row(ExpandedWidth, arrangement = Arrangement.SpaceEvenly) {
+                Row(LayoutExpandedWidth, arrangement = Arrangement.SpaceEvenly) {
                     for (i in 0 until childPosition.size) {
                         Container(width = sizeDp, height = sizeDp) {
                             OnPositioned( coordinates ->
@@ -2003,7 +2003,7 @@
         val childLayoutCoordinates = arrayOfNulls<LayoutCoordinates?>(childPosition.size)
         show {
             Center {
-                Row(ExpandedWidth, arrangement = Arrangement.SpaceBetween) {
+                Row(LayoutExpandedWidth, arrangement = Arrangement.SpaceBetween) {
                     for (i in 0 until childPosition.size) {
                         Container(width = sizeDp, height = sizeDp) {
                             OnPositioned( coordinates ->
@@ -2045,7 +2045,7 @@
         val childLayoutCoordinates = arrayOfNulls<LayoutCoordinates?>(childPosition.size)
         show {
             Center {
-                Row(ExpandedWidth, arrangement = Arrangement.SpaceAround) {
+                Row(LayoutExpandedWidth, arrangement = Arrangement.SpaceAround) {
                     for (i in 0 until childPosition.size) {
                         Container(width = sizeDp, height = sizeDp) {
                             OnPositioned( coordinates ->
@@ -2087,7 +2087,7 @@
         val childLayoutCoordinates = arrayOfNulls<LayoutCoordinates?>(childPosition.size)
         show {
             Center {
-                Row(ExpandedWidth, arrangement = Arrangement(customArrangement)) {
+                Row(LayoutExpandedWidth, arrangement = Arrangement(customArrangement)) {
                     for (i in childPosition.indices) {
                         Container(width = sizeDp, height = sizeDp) {
                             OnPositioned( coordinates ->
@@ -2134,7 +2134,7 @@
         val childLayoutCoordinates = arrayOfNulls<LayoutCoordinates?>(childPosition.size)
         show {
             Center {
-                Column(ExpandedHeight) {
+                Column(LayoutExpandedHeight) {
                     for (i in 0 until childPosition.size) {
                         Container(width = sizeDp, height = sizeDp) {
                             OnPositioned( coordinates ->
@@ -2175,7 +2175,7 @@
         val childLayoutCoordinates = arrayOfNulls<LayoutCoordinates?>(childPosition.size)
         show {
             Center {
-                Column(ExpandedHeight, arrangement = Arrangement.End) {
+                Column(LayoutExpandedHeight, arrangement = Arrangement.End) {
                     for (i in 0 until childPosition.size) {
                         Container(width = sizeDp, height = sizeDp) {
                             OnPositioned( coordinates ->
@@ -2216,7 +2216,7 @@
         val childLayoutCoordinates = arrayOfNulls<LayoutCoordinates?>(childPosition.size)
         show {
             Center {
-                Column(ExpandedHeight, arrangement = Arrangement.Center) {
+                Column(LayoutExpandedHeight, arrangement = Arrangement.Center) {
                     for (i in 0 until childPosition.size) {
                         Container(width = sizeDp, height = sizeDp) {
                             OnPositioned( coordinates ->
@@ -2258,7 +2258,7 @@
         val childLayoutCoordinates = arrayOfNulls<LayoutCoordinates?>(childPosition.size)
         show {
             Center {
-                Column(ExpandedHeight, arrangement = Arrangement.SpaceEvenly) {
+                Column(LayoutExpandedHeight, arrangement = Arrangement.SpaceEvenly) {
                     for (i in 0 until childPosition.size) {
                         Container(width = sizeDp, height = sizeDp) {
                             OnPositioned( coordinates ->
@@ -2300,7 +2300,7 @@
         val childLayoutCoordinates = arrayOfNulls<LayoutCoordinates?>(childPosition.size)
         show {
             Center {
-                Column(ExpandedHeight, arrangement = Arrangement.SpaceBetween) {
+                Column(LayoutExpandedHeight, arrangement = Arrangement.SpaceBetween) {
                     for (i in 0 until childPosition.size) {
                         Container(width = sizeDp, height = sizeDp) {
                             OnPositioned( coordinates ->
@@ -2342,7 +2342,7 @@
         val childLayoutCoordinates = arrayOfNulls<LayoutCoordinates?>(childPosition.size)
         show {
             Center {
-                Column(ExpandedHeight, arrangement = Arrangement.SpaceAround) {
+                Column(LayoutExpandedHeight, arrangement = Arrangement.SpaceAround) {
                     for (i in 0 until childPosition.size) {
                         Container(width = sizeDp, height = sizeDp) {
                             OnPositioned( coordinates ->
@@ -2390,7 +2390,7 @@
         val childLayoutCoordinates = arrayOfNulls<LayoutCoordinates?>(childPosition.size)
         show {
             Center {
-                Column(ExpandedHeight, arrangement = Arrangement(customArrangement)) {
+                Column(LayoutExpandedHeight, arrangement = Arrangement(customArrangement)) {
                     for (i in childPosition.indices) {
                         Container(width = sizeDp, height = sizeDp) {
                             OnPositioned( coordinates ->
@@ -2441,7 +2441,7 @@
                             containerSize.value = coordinates.size
                             layoutLatch.countDown()
                         }) {
-                            Spacer(Size(width = childSizeDp, height = childSizeDp))
+                            Spacer(LayoutSize(width = childSizeDp, height = childSizeDp))
                         }
                     }
                 }
@@ -2470,7 +2470,7 @@
                             containerSize.value = coordinates.size
                             layoutLatch.countDown()
                         }) {
-                            Spacer(Size(width = childSizeDp, height = childSizeDp))
+                            Spacer(LayoutSize(width = childSizeDp, height = childSizeDp))
                         }
                     }
                 }
@@ -2487,57 +2487,61 @@
     fun testRow_withInflexibleChildren_hasCorrectIntrinsicMeasurements() = withDensity(density) {
         testIntrinsics(@Composable {
             Row {
-                Container(AspectRatio(2f)) { }
+                Container(LayoutAspectRatio(2f)) { }
                 ConstrainedBox(DpConstraints.tightConstraints(50.dp, 40.dp)) { }
             }
         }, @Composable {
-            Row(ExpandedWidth) {
-                Container(AspectRatio(2f)) { }
+            Row(LayoutExpandedWidth) {
+                Container(LayoutAspectRatio(2f)) { }
                 ConstrainedBox(DpConstraints.tightConstraints(50.dp, 40.dp)) { }
             }
         }, @Composable {
             Row {
-                Container(AspectRatio(2f) wraps Gravity.Top) { }
-                ConstrainedBox(DpConstraints.tightConstraints(50.dp, 40.dp), Gravity.Center) { }
+                Container(LayoutAspectRatio(2f) wraps LayoutGravity.Top) { }
+                ConstrainedBox(DpConstraints.tightConstraints(50.dp, 40.dp),
+                    LayoutGravity.Center) { }
             }
         }, @Composable {
             Row {
                 Container(
-                    AspectRatio(2f) wraps Gravity.RelativeToSiblings(FirstBaseline)
+                    LayoutAspectRatio(2f) wraps LayoutGravity.RelativeToSiblings(FirstBaseline)
                 ) { }
                 ConstrainedBox(
                     DpConstraints.tightConstraints(50.dp, 40.dp),
-                    Gravity.RelativeToSiblings { it.width }
+                    LayoutGravity.RelativeToSiblings { it.width }
                 ) { }
             }
         }, @Composable {
-            Row(ExpandedWidth, arrangement = Arrangement.Begin) {
-                Container(AspectRatio(2f)) { }
+            Row(LayoutExpandedWidth, arrangement = Arrangement.Begin) {
+                Container(LayoutAspectRatio(2f)) { }
                 ConstrainedBox(DpConstraints.tightConstraints(50.dp, 40.dp)) { }
             }
         }, @Composable {
-            Row(ExpandedWidth, arrangement = Arrangement.Center) {
-                Container(Gravity.Center wraps AspectRatio(2f)) { }
-                ConstrainedBox(DpConstraints.tightConstraints(50.dp, 40.dp), Gravity.Center) { }
+            Row(LayoutExpandedWidth, arrangement = Arrangement.Center) {
+                Container(LayoutGravity.Center wraps LayoutAspectRatio(2f)) { }
+                ConstrainedBox(DpConstraints.tightConstraints(50.dp, 40.dp),
+                    LayoutGravity.Center) { }
             }
         }, @Composable {
-            Row(ExpandedWidth, arrangement = Arrangement.End) {
-                Container(Gravity.Bottom wraps AspectRatio(2f)) { }
-                ConstrainedBox(DpConstraints.tightConstraints(50.dp, 40.dp), Gravity.Bottom) { }
+            Row(LayoutExpandedWidth, arrangement = Arrangement.End) {
+                Container(LayoutGravity.Bottom wraps LayoutAspectRatio(2f)) { }
+                ConstrainedBox(DpConstraints.tightConstraints(50.dp, 40.dp),
+                    LayoutGravity.Bottom) { }
             }
         }, @Composable {
-            Row(ExpandedWidth, arrangement = Arrangement.SpaceAround) {
-                Container(ExpandedHeight wraps AspectRatio(2f)) { }
-                ConstrainedBox(DpConstraints.tightConstraints(50.dp, 40.dp), ExpandedHeight) { }
+            Row(LayoutExpandedWidth, arrangement = Arrangement.SpaceAround) {
+                Container(LayoutExpandedHeight wraps LayoutAspectRatio(2f)) { }
+                ConstrainedBox(DpConstraints.tightConstraints(50.dp, 40.dp),
+                    LayoutExpandedHeight) { }
             }
         }, @Composable {
-            Row(ExpandedWidth, arrangement = Arrangement.SpaceBetween) {
-                Container(AspectRatio(2f)) { }
+            Row(LayoutExpandedWidth, arrangement = Arrangement.SpaceBetween) {
+                Container(LayoutAspectRatio(2f)) { }
                 ConstrainedBox(DpConstraints.tightConstraints(50.dp, 40.dp)) { }
             }
         }, @Composable {
-            Row(ExpandedWidth, arrangement = Arrangement.SpaceEvenly) {
-                Container(AspectRatio(2f)) { }
+            Row(LayoutExpandedWidth, arrangement = Arrangement.SpaceEvenly) {
+                Container(LayoutAspectRatio(2f)) { }
                 ConstrainedBox(DpConstraints.tightConstraints(50.dp, 40.dp)) { }
             }
         }) { minIntrinsicWidth, minIntrinsicHeight, maxIntrinsicWidth, maxIntrinsicHeight ->
@@ -2564,97 +2568,98 @@
     fun testRow_withFlexibleChildren_hasCorrectIntrinsicMeasurements() = withDensity(density) {
         testIntrinsics(@Composable {
             Row {
-                ConstrainedBox(DpConstraints.tightConstraints(20.dp, 30.dp), Flexible(3f)) { }
-                ConstrainedBox(DpConstraints.tightConstraints(30.dp, 40.dp), Flexible(2f)) { }
-                Container(AspectRatio(2f) wraps Flexible(2f)) { }
+                ConstrainedBox(DpConstraints.tightConstraints(20.dp, 30.dp), LayoutFlexible(3f)) { }
+                ConstrainedBox(DpConstraints.tightConstraints(30.dp, 40.dp), LayoutFlexible(2f)) { }
+                Container(LayoutAspectRatio(2f) wraps LayoutFlexible(2f)) { }
                 ConstrainedBox(DpConstraints.tightConstraints(20.dp, 30.dp)) { }
             }
         }, @Composable {
             Row {
                 ConstrainedBox(
                     DpConstraints.tightConstraints(20.dp, 30.dp),
-                    Flexible(3f) wraps Gravity.Top
+                    LayoutFlexible(3f) wraps LayoutGravity.Top
                 ) { }
                 ConstrainedBox(
                     DpConstraints.tightConstraints(30.dp, 40.dp),
-                    Flexible(2f) wraps Gravity.Center
+                    LayoutFlexible(2f) wraps LayoutGravity.Center
                 ) { }
-                Container(AspectRatio(2f) wraps Flexible(2f)) { }
-                ConstrainedBox(DpConstraints.tightConstraints(20.dp, 30.dp), Gravity.Bottom) { }
+                Container(LayoutAspectRatio(2f) wraps LayoutFlexible(2f)) { }
+                ConstrainedBox(DpConstraints.tightConstraints(20.dp, 30.dp),
+                    LayoutGravity.Bottom) { }
             }
         }, @Composable {
             Row(arrangement = Arrangement.Begin) {
-                ConstrainedBox(DpConstraints.tightConstraints(20.dp, 30.dp), Flexible(3f)) { }
-                ConstrainedBox(DpConstraints.tightConstraints(30.dp, 40.dp), Flexible(2f)) { }
-                Container(AspectRatio(2f) wraps Flexible(2f)) { }
+                ConstrainedBox(DpConstraints.tightConstraints(20.dp, 30.dp), LayoutFlexible(3f)) { }
+                ConstrainedBox(DpConstraints.tightConstraints(30.dp, 40.dp), LayoutFlexible(2f)) { }
+                Container(LayoutAspectRatio(2f) wraps LayoutFlexible(2f)) { }
                 ConstrainedBox(DpConstraints.tightConstraints(20.dp, 30.dp)) { }
             }
         }, @Composable {
             Row(arrangement = Arrangement.Center) {
                 ConstrainedBox(
                     constraints = DpConstraints.tightConstraints(20.dp, 30.dp),
-                    modifier = Flexible(3f) wraps Gravity.Center
+                    modifier = LayoutFlexible(3f) wraps LayoutGravity.Center
                 ) { }
                 ConstrainedBox(
                     constraints = DpConstraints.tightConstraints(30.dp, 40.dp),
-                    modifier = Flexible(2f) wraps Gravity.Center
+                    modifier = LayoutFlexible(2f) wraps LayoutGravity.Center
                 ) { }
                 Container(
-                    AspectRatio(2f) wraps Flexible(2f) wraps Gravity.Center
+                    LayoutAspectRatio(2f) wraps LayoutFlexible(2f) wraps LayoutGravity.Center
                 ) { }
                 ConstrainedBox(
                     constraints = DpConstraints.tightConstraints(20.dp, 30.dp),
-                    modifier = Gravity.Center
+                    modifier = LayoutGravity.Center
                 ) { }
             }
         }, @Composable {
             Row(arrangement = Arrangement.End) {
                 ConstrainedBox(
                     constraints = DpConstraints.tightConstraints(20.dp, 30.dp),
-                    modifier = Flexible(3f) wraps Gravity.Bottom
+                    modifier = LayoutFlexible(3f) wraps LayoutGravity.Bottom
                 ) { }
                 ConstrainedBox(
                     constraints = DpConstraints.tightConstraints(30.dp, 40.dp),
-                    modifier = Flexible(2f) wraps Gravity.Bottom
+                    modifier = LayoutFlexible(2f) wraps LayoutGravity.Bottom
                 ) { }
                 Container(
-                    AspectRatio(2f) wraps Flexible(2f) wraps Gravity.Bottom
+                    LayoutAspectRatio(2f) wraps LayoutFlexible(2f) wraps LayoutGravity.Bottom
                 ) { }
                 ConstrainedBox(
                     constraints = DpConstraints.tightConstraints(20.dp, 30.dp),
-                    modifier = Gravity.Bottom
+                    modifier = LayoutGravity.Bottom
                 ) { }
             }
         }, @Composable {
             Row(arrangement = Arrangement.SpaceAround) {
                 ConstrainedBox(
                     constraints = DpConstraints.tightConstraints(20.dp, 30.dp),
-                    modifier = Flexible(3f) wraps ExpandedHeight
+                    modifier = LayoutFlexible(3f) wraps LayoutExpandedHeight
                 ) { }
                 ConstrainedBox(
                     constraints = DpConstraints.tightConstraints(30.dp, 40.dp),
-                    modifier = Flexible(2f) wraps ExpandedHeight
+                    modifier = LayoutFlexible(2f) wraps LayoutExpandedHeight
                 ) { }
                 Container(
-                    AspectRatio(2f) wraps Flexible(2f) wraps ExpandedHeight
+                    LayoutAspectRatio(2f) wraps LayoutFlexible(2f) wraps LayoutExpandedHeight
                 ) { }
                 ConstrainedBox(
                     constraints = DpConstraints.tightConstraints(20.dp, 30.dp),
-                    modifier = ExpandedHeight
+                    modifier = LayoutExpandedHeight
                 ) { }
             }
         }, @Composable {
             Row(arrangement = Arrangement.SpaceBetween) {
-                ConstrainedBox(DpConstraints.tightConstraints(20.dp, 30.dp), Flexible(3f)) { }
-                ConstrainedBox(DpConstraints.tightConstraints(30.dp, 40.dp), Flexible(2f)) { }
-                Container(AspectRatio(2f) wraps Flexible(2f)) { }
+                ConstrainedBox(DpConstraints.tightConstraints(20.dp, 30.dp), LayoutFlexible(3f)) { }
+                ConstrainedBox(DpConstraints.tightConstraints(30.dp, 40.dp), LayoutFlexible(2f)) { }
+                Container(LayoutAspectRatio(2f) wraps LayoutFlexible(2f)) { }
                 ConstrainedBox(DpConstraints.tightConstraints(20.dp, 30.dp)) { }
             }
         }, @Composable {
             Row(arrangement = Arrangement.SpaceEvenly) {
-                ConstrainedBox(DpConstraints.tightConstraints(20.dp, 30.dp), Flexible(3f)) { }
-                ConstrainedBox(DpConstraints.tightConstraints(30.dp, 40.dp), Flexible(2f)) { }
-                Container(AspectRatio(2f) wraps Flexible(2f)) { }
+                ConstrainedBox(DpConstraints.tightConstraints(20.dp, 30.dp), LayoutFlexible(3f)) { }
+                ConstrainedBox(DpConstraints.tightConstraints(30.dp, 40.dp), LayoutFlexible(2f)) { }
+                Container(LayoutAspectRatio(2f) wraps LayoutFlexible(2f)) { }
                 ConstrainedBox(DpConstraints.tightConstraints(20.dp, 30.dp)) { }
             }
         }) { minIntrinsicWidth, minIntrinsicHeight, maxIntrinsicWidth, maxIntrinsicHeight ->
@@ -2709,55 +2714,57 @@
     fun testColumn_withInflexibleChildren_hasCorrectIntrinsicMeasurements() = withDensity(density) {
         testIntrinsics(@Composable {
             Column {
-                Container(AspectRatio(2f)) { }
+                Container(LayoutAspectRatio(2f)) { }
                 ConstrainedBox(DpConstraints.tightConstraints(50.dp, 40.dp)) { }
             }
         }, @Composable {
             Column {
-                Container(AspectRatio(2f) wraps Gravity.Start) { }
-                ConstrainedBox(DpConstraints.tightConstraints(50.dp, 40.dp), Gravity.End) { }
+                Container(LayoutAspectRatio(2f) wraps LayoutGravity.Start) { }
+                ConstrainedBox(DpConstraints.tightConstraints(50.dp, 40.dp), LayoutGravity.End) { }
             }
         }, @Composable {
             Column {
-                Container(AspectRatio(2f) wraps Gravity.RelativeToSiblings { 0.ipx }) { }
+                Container(LayoutAspectRatio(2f) wraps
+                        LayoutGravity.RelativeToSiblings { 0.ipx }) { }
                 ConstrainedBox(
                     DpConstraints.tightConstraints(50.dp, 40.dp),
-                    Gravity.RelativeToSiblings(TestVerticalLine)
+                    LayoutGravity.RelativeToSiblings(TestVerticalLine)
                 ) { }
             }
         }, @Composable {
-            Column(ExpandedHeight) {
-                Container(AspectRatio(2f)) { }
+            Column(LayoutExpandedHeight) {
+                Container(LayoutAspectRatio(2f)) { }
                 ConstrainedBox(DpConstraints.tightConstraints(50.dp, 40.dp)) { }
             }
         }, @Composable {
-            Column(ExpandedHeight, arrangement = Arrangement.Begin) {
-                Container(AspectRatio(2f)) { }
+            Column(LayoutExpandedHeight, arrangement = Arrangement.Begin) {
+                Container(LayoutAspectRatio(2f)) { }
                 ConstrainedBox(DpConstraints.tightConstraints(50.dp, 40.dp)) { }
             }
         }, @Composable {
-            Column(ExpandedHeight, arrangement = Arrangement.Center) {
-                Container(Gravity.Center wraps AspectRatio(2f)) { }
+            Column(LayoutExpandedHeight, arrangement = Arrangement.Center) {
+                Container(LayoutGravity.Center wraps LayoutAspectRatio(2f)) { }
                 ConstrainedBox(DpConstraints.tightConstraints(50.dp, 40.dp)) { }
             }
         }, @Composable {
-            Column(ExpandedHeight, arrangement = Arrangement.End) {
-                Container(Gravity.End wraps AspectRatio(2f)) { }
-                ConstrainedBox(DpConstraints.tightConstraints(50.dp, 40.dp), Gravity.End) { }
+            Column(LayoutExpandedHeight, arrangement = Arrangement.End) {
+                Container(LayoutGravity.End wraps LayoutAspectRatio(2f)) { }
+                ConstrainedBox(DpConstraints.tightConstraints(50.dp, 40.dp), LayoutGravity.End) { }
             }
         }, @Composable {
-            Column(ExpandedHeight, arrangement = Arrangement.SpaceAround) {
-                Container(ExpandedWidth wraps AspectRatio(2f)) { }
-                ConstrainedBox(DpConstraints.tightConstraints(50.dp, 40.dp), ExpandedWidth) { }
+            Column(LayoutExpandedHeight, arrangement = Arrangement.SpaceAround) {
+                Container(LayoutExpandedWidth wraps LayoutAspectRatio(2f)) { }
+                ConstrainedBox(DpConstraints.tightConstraints(50.dp, 40.dp),
+                    LayoutExpandedWidth) { }
             }
         }, @Composable {
-            Column(ExpandedHeight, arrangement = Arrangement.SpaceBetween) {
-                Container(AspectRatio(2f)) { }
+            Column(LayoutExpandedHeight, arrangement = Arrangement.SpaceBetween) {
+                Container(LayoutAspectRatio(2f)) { }
                 ConstrainedBox(DpConstraints.tightConstraints(50.dp, 40.dp)) { }
             }
         }, @Composable {
-            Column(ExpandedHeight, arrangement = Arrangement.SpaceEvenly) {
-                Container(AspectRatio(2f)) { }
+            Column(LayoutExpandedHeight, arrangement = Arrangement.SpaceEvenly) {
+                Container(LayoutAspectRatio(2f)) { }
                 ConstrainedBox(DpConstraints.tightConstraints(50.dp, 40.dp)) { }
             }
         }) { minIntrinsicWidth, minIntrinsicHeight, maxIntrinsicWidth, maxIntrinsicHeight ->
@@ -2784,97 +2791,97 @@
     fun testColumn_withFlexibleChildren_hasCorrectIntrinsicMeasurements() = withDensity(density) {
         testIntrinsics(@Composable {
             Column {
-                ConstrainedBox(DpConstraints.tightConstraints(30.dp, 20.dp), Flexible(3f)) { }
-                ConstrainedBox(DpConstraints.tightConstraints(40.dp, 30.dp), Flexible(2f)) { }
-                Container(AspectRatio(0.5f) wraps Flexible(2f)) { }
+                ConstrainedBox(DpConstraints.tightConstraints(30.dp, 20.dp), LayoutFlexible(3f)) { }
+                ConstrainedBox(DpConstraints.tightConstraints(40.dp, 30.dp), LayoutFlexible(2f)) { }
+                Container(LayoutAspectRatio(0.5f) wraps LayoutFlexible(2f)) { }
                 ConstrainedBox(DpConstraints.tightConstraints(30.dp, 20.dp)) { }
             }
         }, @Composable {
             Column {
                 ConstrainedBox(
                     DpConstraints.tightConstraints(30.dp, 20.dp),
-                    Flexible(3f) wraps Gravity.Start
+                    LayoutFlexible(3f) wraps LayoutGravity.Start
                 ) { }
                 ConstrainedBox(
                     DpConstraints.tightConstraints(40.dp, 30.dp),
-                    Flexible(2f) wraps Gravity.Center
+                    LayoutFlexible(2f) wraps LayoutGravity.Center
                 ) { }
-                Container(AspectRatio(0.5f) wraps Flexible(2f)) { }
-                ConstrainedBox(DpConstraints.tightConstraints(30.dp, 20.dp), Gravity.End) { }
+                Container(LayoutAspectRatio(0.5f) wraps LayoutFlexible(2f)) { }
+                ConstrainedBox(DpConstraints.tightConstraints(30.dp, 20.dp), LayoutGravity.End) { }
             }
         }, @Composable {
             Column(arrangement = Arrangement.Begin) {
-                ConstrainedBox(DpConstraints.tightConstraints(30.dp, 20.dp), Flexible(3f)) { }
-                ConstrainedBox(DpConstraints.tightConstraints(40.dp, 30.dp), Flexible(2f)) { }
-                Container(AspectRatio(0.5f) wraps Flexible(2f)) { }
+                ConstrainedBox(DpConstraints.tightConstraints(30.dp, 20.dp), LayoutFlexible(3f)) { }
+                ConstrainedBox(DpConstraints.tightConstraints(40.dp, 30.dp), LayoutFlexible(2f)) { }
+                Container(LayoutAspectRatio(0.5f) wraps LayoutFlexible(2f)) { }
                 ConstrainedBox(DpConstraints.tightConstraints(30.dp, 20.dp)) { }
             }
         }, @Composable {
             Column(arrangement = Arrangement.Center) {
                 ConstrainedBox(
                     constraints = DpConstraints.tightConstraints(30.dp, 20.dp),
-                    modifier = Flexible(3f) wraps Gravity.Center
+                    modifier = LayoutFlexible(3f) wraps LayoutGravity.Center
                 ) { }
                 ConstrainedBox(
                     constraints = DpConstraints.tightConstraints(40.dp, 30.dp),
-                    modifier = Flexible(2f) wraps Gravity.Center
+                    modifier = LayoutFlexible(2f) wraps LayoutGravity.Center
                 ) { }
                 Container(
-                    AspectRatio(0.5f) wraps Flexible(2f) wraps Gravity.Center
+                    LayoutAspectRatio(0.5f) wraps LayoutFlexible(2f) wraps LayoutGravity.Center
                 ) { }
                 ConstrainedBox(
                     constraints = DpConstraints.tightConstraints(30.dp, 20.dp),
-                    modifier = Gravity.Center
+                    modifier = LayoutGravity.Center
                 ) { }
             }
         }, @Composable {
             Column(arrangement = Arrangement.End) {
                 ConstrainedBox(
                     constraints = DpConstraints.tightConstraints(30.dp, 20.dp),
-                    modifier = Flexible(3f) wraps Gravity.End
+                    modifier = LayoutFlexible(3f) wraps LayoutGravity.End
                 ) { }
                 ConstrainedBox(
                     constraints = DpConstraints.tightConstraints(40.dp, 30.dp),
-                    modifier = Flexible(2f) wraps Gravity.End
+                    modifier = LayoutFlexible(2f) wraps LayoutGravity.End
                 ) { }
                 Container(
-                    AspectRatio(0.5f) wraps Flexible(2f) wraps Gravity.End
+                    LayoutAspectRatio(0.5f) wraps LayoutFlexible(2f) wraps LayoutGravity.End
                 ) { }
                 ConstrainedBox(
                     constraints = DpConstraints.tightConstraints(30.dp, 20.dp),
-                    modifier = Gravity.End
+                    modifier = LayoutGravity.End
                 ) { }
             }
         }, @Composable {
             Column(arrangement = Arrangement.SpaceAround) {
                 ConstrainedBox(
                     constraints = DpConstraints.tightConstraints(30.dp, 20.dp),
-                    modifier = Flexible(3f) wraps ExpandedWidth
+                    modifier = LayoutFlexible(3f) wraps LayoutExpandedWidth
                 ) { }
                 ConstrainedBox(
                     constraints = DpConstraints.tightConstraints(40.dp, 30.dp),
-                    modifier = Flexible(2f) wraps ExpandedWidth
+                    modifier = LayoutFlexible(2f) wraps LayoutExpandedWidth
                 ) { }
                 Container(
-                    AspectRatio(0.5f) wraps Flexible(2f) wraps ExpandedWidth
+                    LayoutAspectRatio(0.5f) wraps LayoutFlexible(2f) wraps LayoutExpandedWidth
                 ) { }
                 ConstrainedBox(
                     constraints = DpConstraints.tightConstraints(30.dp, 20.dp),
-                    modifier = ExpandedWidth
+                    modifier = LayoutExpandedWidth
                 ) { }
             }
         }, @Composable {
             Column(arrangement = Arrangement.SpaceBetween) {
-                ConstrainedBox(DpConstraints.tightConstraints(30.dp, 20.dp), Flexible(3f)) { }
-                ConstrainedBox(DpConstraints.tightConstraints(40.dp, 30.dp), Flexible(2f)) { }
-                Container(AspectRatio(0.5f) wraps Flexible(2f)) { }
+                ConstrainedBox(DpConstraints.tightConstraints(30.dp, 20.dp), LayoutFlexible(3f)) { }
+                ConstrainedBox(DpConstraints.tightConstraints(40.dp, 30.dp), LayoutFlexible(2f)) { }
+                Container(LayoutAspectRatio(0.5f) wraps LayoutFlexible(2f)) { }
                 ConstrainedBox(DpConstraints.tightConstraints(30.dp, 20.dp)) { }
             }
         }, @Composable {
             Column(arrangement = Arrangement.SpaceEvenly) {
-                ConstrainedBox(DpConstraints.tightConstraints(30.dp, 20.dp), Flexible(3f)) { }
-                ConstrainedBox(DpConstraints.tightConstraints(40.dp, 30.dp), Flexible(2f)) { }
-                Container(AspectRatio(0.5f) wraps Flexible(2f)) { }
+                ConstrainedBox(DpConstraints.tightConstraints(30.dp, 20.dp), LayoutFlexible(3f)) { }
+                ConstrainedBox(DpConstraints.tightConstraints(40.dp, 30.dp), LayoutFlexible(2f)) { }
+                Container(LayoutAspectRatio(0.5f) wraps LayoutFlexible(2f)) { }
                 ConstrainedBox(DpConstraints.tightConstraints(30.dp, 20.dp)) { }
             }
         }) { minIntrinsicWidth, minIntrinsicHeight, maxIntrinsicWidth, maxIntrinsicHeight ->
@@ -2936,7 +2943,7 @@
                     ConstrainedBox(DpConstraints.tightConstraints(30.dp, 40.dp)) { }
                 }
                 expanded(flex = 2f) {
-                    Container(AspectRatio(2f)) { }
+                    Container(LayoutAspectRatio(2f)) { }
                 }
                 inflexible {
                     ConstrainedBox(DpConstraints.tightConstraints(20.dp, 30.dp)) { }
@@ -2951,7 +2958,7 @@
                     ConstrainedBox(DpConstraints.tightConstraints(30.dp, 40.dp)) { }
                 }
                 expanded(flex = 2f) {
-                    Container(AspectRatio(2f)) { }
+                    Container(LayoutAspectRatio(2f)) { }
                 }
                 inflexible {
                     ConstrainedBox(DpConstraints.tightConstraints(20.dp, 30.dp)) { }
@@ -2969,7 +2976,7 @@
                     ConstrainedBox(DpConstraints.tightConstraints(30.dp, 40.dp)) { }
                 }
                 expanded(flex = 2f) {
-                    Container(AspectRatio(2f)) { }
+                    Container(LayoutAspectRatio(2f)) { }
                 }
                 inflexible {
                     ConstrainedBox(DpConstraints.tightConstraints(20.dp, 30.dp)) { }
@@ -2987,7 +2994,7 @@
                     ConstrainedBox(DpConstraints.tightConstraints(30.dp, 40.dp)) { }
                 }
                 expanded(flex = 2f) {
-                    Container(AspectRatio(2f)) { }
+                    Container(LayoutAspectRatio(2f)) { }
                 }
                 inflexible {
                     ConstrainedBox(DpConstraints.tightConstraints(20.dp, 30.dp)) { }
@@ -3005,7 +3012,7 @@
                     ConstrainedBox(DpConstraints.tightConstraints(30.dp, 40.dp)) { }
                 }
                 expanded(flex = 2f) {
-                    Container(AspectRatio(2f)) { }
+                    Container(LayoutAspectRatio(2f)) { }
                 }
                 inflexible {
                     ConstrainedBox(DpConstraints.tightConstraints(20.dp, 30.dp)) { }
@@ -3020,7 +3027,7 @@
                     ConstrainedBox(DpConstraints.tightConstraints(30.dp, 40.dp)) { }
                 }
                 expanded(flex = 2f) {
-                    Container(AspectRatio(2f)) { }
+                    Container(LayoutAspectRatio(2f)) { }
                 }
                 inflexible {
                     ConstrainedBox(DpConstraints.tightConstraints(20.dp, 30.dp)) { }
@@ -3035,7 +3042,7 @@
                     ConstrainedBox(DpConstraints.tightConstraints(30.dp, 40.dp)) { }
                 }
                 expanded(flex = 2f) {
-                    Container(AspectRatio(2f)) { }
+                    Container(LayoutAspectRatio(2f)) { }
                 }
                 inflexible {
                     ConstrainedBox(DpConstraints.tightConstraints(20.dp, 30.dp)) { }
@@ -3100,7 +3107,7 @@
                     ConstrainedBox(DpConstraints.tightConstraints(40.dp, 30.dp)) { }
                 }
                 expanded(flex = 2f) {
-                    Container(AspectRatio(0.5f)) { }
+                    Container(LayoutAspectRatio(0.5f)) { }
                 }
                 inflexible {
                     ConstrainedBox(DpConstraints.tightConstraints(30.dp, 20.dp)) { }
@@ -3115,7 +3122,7 @@
                     ConstrainedBox(DpConstraints.tightConstraints(40.dp, 30.dp)) { }
                 }
                 expanded(flex = 2f) {
-                    Container(AspectRatio(0.5f)) { }
+                    Container(LayoutAspectRatio(0.5f)) { }
                 }
                 inflexible {
                     ConstrainedBox(DpConstraints.tightConstraints(30.dp, 20.dp)) { }
@@ -3133,7 +3140,7 @@
                     ConstrainedBox(DpConstraints.tightConstraints(40.dp, 30.dp)) { }
                 }
                 expanded(flex = 2f) {
-                    Container(AspectRatio(0.5f)) { }
+                    Container(LayoutAspectRatio(0.5f)) { }
                 }
                 inflexible {
                     ConstrainedBox(DpConstraints.tightConstraints(30.dp, 20.dp)) { }
@@ -3151,7 +3158,7 @@
                     ConstrainedBox(DpConstraints.tightConstraints(40.dp, 30.dp)) { }
                 }
                 expanded(flex = 2f) {
-                    Container(AspectRatio(0.5f)) { }
+                    Container(LayoutAspectRatio(0.5f)) { }
                 }
                 inflexible {
                     ConstrainedBox(DpConstraints.tightConstraints(30.dp, 20.dp)) { }
@@ -3169,7 +3176,7 @@
                     ConstrainedBox(DpConstraints.tightConstraints(40.dp, 30.dp)) { }
                 }
                 expanded(flex = 2f) {
-                    Container(AspectRatio(0.5f)) { }
+                    Container(LayoutAspectRatio(0.5f)) { }
                 }
                 inflexible {
                     ConstrainedBox(DpConstraints.tightConstraints(30.dp, 20.dp)) { }
@@ -3184,7 +3191,7 @@
                     ConstrainedBox(DpConstraints.tightConstraints(40.dp, 30.dp)) { }
                 }
                 expanded(flex = 2f) {
-                    Container(AspectRatio(0.5f)) { }
+                    Container(LayoutAspectRatio(0.5f)) { }
                 }
                 inflexible {
                     ConstrainedBox(DpConstraints.tightConstraints(30.dp, 20.dp)) { }
@@ -3199,7 +3206,7 @@
                     ConstrainedBox(DpConstraints.tightConstraints(40.dp, 30.dp)) { }
                 }
                 expanded(flex = 2f) {
-                    Container(AspectRatio(0.5f)) { }
+                    Container(LayoutAspectRatio(0.5f)) { }
                 }
                 inflexible {
                     ConstrainedBox(DpConstraints.tightConstraints(30.dp, 20.dp)) { }
@@ -3348,13 +3355,14 @@
 
         show {
             Align(Alignment.TopLeft) {
-                Column(ExpandedHeight) {
+                Column(LayoutExpandedHeight) {
                     OnChildPositioned( coordinates ->
                         containerSize.value = coordinates.size
                         containerPosition.value = coordinates.localToGlobal(PxPosition(0.px, 0.px))
                         positionedLatch.countDown()
                     }) {
-                        Container(Inflexible wraps Flexible(1f), width = 40.dp, height = 40.dp) {}
+                        Container(LayoutInflexible wraps LayoutFlexible(1f),
+                            width = 40.dp, height = 40.dp) {}
                     }
                 }
             }
@@ -3376,7 +3384,7 @@
         show {
             Row {
                 Container(
-                    modifier = Gravity.RelativeToSiblings { it.height },
+                    modifier = LayoutGravity.RelativeToSiblings { it.height },
                     width = size,
                     height = size
                 ) {}
@@ -3386,8 +3394,8 @@
                     positionedLatch.countDown()
                 }) {
                     Container(
-                        modifier = Gravity.RelativeToSiblings { 0.ipx }
-                                wraps Gravity.RelativeToSiblings { it.height * 0.5 },
+                        modifier = LayoutGravity.RelativeToSiblings { 0.ipx }
+                                wraps LayoutGravity.RelativeToSiblings { it.height * 0.5 },
                         width = size,
                         height = size
                     ) {}

diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/SpacingModifierTest.kt b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/LayoutPaddingTest.kt
similarity index 69%
rename from ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/SpacingModifierTest.kt
rename to ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/LayoutPaddingTest.kt
index cd84d9c..91dc6a5 100644
--- a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/SpacingModifierTest.kt
+++ b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/LayoutPaddingTest.kt

@@ -35,8 +35,8 @@
 import androidx.ui.core.Layout
 import androidx.ui.core.Modifier
 import androidx.ui.core.min
-import androidx.ui.layout.AspectRatio
-import androidx.ui.layout.Spacing
+import androidx.ui.layout.LayoutAspectRatio
+import androidx.ui.layout.LayoutPadding
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -46,85 +46,86 @@
 
 @SmallTest
 @RunWith(JUnit4::class)
-class SpacingModifierTest : LayoutTest() {
+class LayoutPaddingTest : LayoutTest() {
 
     /**
-     * Tests that the [Spacing]-all and [Spacing] factories return equivalent modifiers.
+     * Tests that the [LayoutPadding]-all and [LayoutPadding] factories return equivalent modifiers.
      */
     @Test
     fun allEqualToAbsoluteWithExplicitSides() {
         Assert.assertEquals(
-            Spacing(10.dp, 10.dp, 10.dp, 10.dp),
-            Spacing(10.dp)
+            LayoutPadding(10.dp, 10.dp, 10.dp, 10.dp),
+            LayoutPadding(10.dp)
         )
     }
 
     /**
-     * Tests the top-level [Spacing] modifier factory with a single "all sides" argument,
-     * checking that a uniform spacing of all sides is applied to a child when plenty of space is
-     * available for both content and spacing.
+     * Tests the top-level [LayoutPadding] modifier factory with a single "all sides" argument,
+     * checking that a uniform padding of all sides is applied to a child when plenty of space is
+     * available for both content and padding.
      */
     @Test
-    fun spacingAllAppliedToChild() = withDensity(density) {
-        val spacing = 10.dp
-        testSpacingIsAppliedImplementation(spacing) { child: @Composable() () -> Unit ->
-            TestBox(modifier = Spacing(spacing), body = child)
+    fun paddingAllAppliedToChild() = withDensity(density) {
+        val padding = 10.dp
+        testPaddingIsAppliedImplementation(padding) { child: @Composable() () -> Unit ->
+            TestBox(modifier = LayoutPadding(padding), body = child)
         }
     }
 
     /**
-     * Tests the top-level [Spacing] modifier factory with different values for left, top,
-     * right and bottom spacings, checking that this spacing is applied as expected when plenty of
-     * space is available for both the content and spacing.
+     * Tests the top-level [LayoutPadding] modifier factory with different values for left, top,
+     * right and bottom paddings, checking that this padding is applied as expected when plenty of
+     * space is available for both the content and padding.
      */
     @Test
-    fun absoluteSpacingAppliedToChild() {
-        val spacingLeft = 10.dp
-        val spacingTop = 15.dp
-        val spacingRight = 20.dp
-        val spacingBottom = 30.dp
-        val spacing = Spacing(spacingLeft, spacingTop, spacingRight, spacingBottom)
-        testSpacingWithDifferentInsetsImplementation(
-            spacingLeft,
-            spacingTop,
-            spacingRight,
-            spacingBottom
+    fun absolutePaddingAppliedToChild() {
+        val paddingLeft = 10.dp
+        val paddingTop = 15.dp
+        val paddingRight = 20.dp
+        val paddingBottom = 30.dp
+        val padding = LayoutPadding(paddingLeft, paddingTop, paddingRight, paddingBottom)
+        testPaddingWithDifferentInsetsImplementation(
+            paddingLeft,
+            paddingTop,
+            paddingRight,
+            paddingBottom
         ) { child: @Composable() () -> Unit ->
-            TestBox(modifier = spacing, body = child)
+            TestBox(modifier = padding, body = child)
         }
     }
 
     /**
-     * Tests the result of the [Spacing] modifier factory when not enough space is available to
-     * accommodate both the spacing and the content. In this case, the spacing should still be
-     * applied, modifying the final position of the content by its left and top spacings even if it
-     * would result in constraints that the child content is unable or unwilling to satisfy.
+     * Tests the result of the [LayoutPadding] modifier factory when not enough space is
+     * available to accommodate both the padding and the content. In this case, the padding
+     * should still be applied, modifying the final position of the content by its left and top
+     * paddings even if it would result in constraints that the child content is unable or
+     * unwilling to satisfy.
      */
     @Test
     fun insufficientSpaceAvailable() = withDensity(density) {
-        val spacing = 30.dp
-        testSpacingWithInsufficientSpaceImplementation(spacing) { child: @Composable() () -> Unit ->
-            TestBox(modifier = Spacing(spacing), body = child)
+        val padding = 30.dp
+        testPaddingWithInsufficientSpaceImplementation(padding) { child: @Composable() () -> Unit ->
+            TestBox(modifier = LayoutPadding(padding), body = child)
         }
     }
 
     @Test
     fun intrinsicMeasurements() = withDensity(density) {
-        val spacing = 100.ipx.toDp()
+        val padding = 100.ipx.toDp()
 
         val latch = CountDownLatch(1)
         var error: Throwable? = null
         testIntrinsics(@Composable {
-            TestBox(modifier = Spacing(spacing)) {
-                Container(AspectRatio(2f)) { }
+            TestBox(modifier = LayoutPadding(padding)) {
+                Container(LayoutAspectRatio(2f)) { }
             }
         }) { minIntrinsicWidth, minIntrinsicHeight, maxIntrinsicWidth, maxIntrinsicHeight ->
             // Spacing is applied on both sides of an axis
-            val totalAxisSpacing = (spacing * 2).toIntPx()
+            val totalAxisSpacing = (padding * 2).toIntPx()
 
-            // When the width/height is measured as 3 x the spacing
-            val testDimension = (spacing * 3).toIntPx()
-            // The actual dimension for the AspectRatio will be: test dimension - total spacing
+            // When the width/height is measured as 3 x the padding
+            val testDimension = (padding * 3).toIntPx()
+            // The actual dimension for the AspectRatio will be: test dimension - total padding
             val actualAspectRatioDimension = testDimension - totalAxisSpacing
 
             // When we measure the width first, the height will be half
@@ -132,9 +133,9 @@
             // When we measure the height first, the width will be double
             val expectedAspectRatioWidth = actualAspectRatioDimension * 2
 
-            // Add back the spacing on both sides to get the total expected height
+            // Add back the padding on both sides to get the total expected height
             val expectedTotalHeight = expectedAspectRatioHeight + totalAxisSpacing
-            // Add back the spacing on both sides to get the total expected height
+            // Add back the padding on both sides to get the total expected height
             val expectedTotalWidth = expectedAspectRatioWidth + totalAxisSpacing
 
             try {
@@ -167,13 +168,13 @@
         Unit
     }
 
-    private fun testSpacingIsAppliedImplementation(
-        spacing: Dp,
-        spacingContainer: @Composable() (@Composable() () -> Unit) -> Unit
+    private fun testPaddingIsAppliedImplementation(
+        padding: Dp,
+        paddingContainer: @Composable() (@Composable() () -> Unit) -> Unit
     ) = withDensity(density) {
         val sizeDp = 50.dp
         val size = sizeDp.toIntPx()
-        val spacingPx = spacing.toIntPx()
+        val paddingPx = padding.toIntPx()
 
         val drawLatch = CountDownLatch(1)
         var childSize = PxSize(-1.px, -1.px)
@@ -191,7 +192,7 @@
                             })
                         }
                     }
-                    spacingContainer(children)
+                    paddingContainer(children)
                 }
             }
         }
@@ -200,22 +201,22 @@
         val root = findAndroidComposeView()
         waitForDraw(root)
 
-        val innerSize = (size - spacingPx * 2)
+        val innerSize = (size - paddingPx * 2)
         assertEquals(PxSize(innerSize, innerSize), childSize)
-        val left = ((root.width.ipx - size) / 2) + spacingPx
-        val top = ((root.height.ipx - size) / 2) + spacingPx
+        val left = ((root.width.ipx - size) / 2) + paddingPx
+        val top = ((root.height.ipx - size) / 2) + paddingPx
         assertEquals(
             PxPosition(left.toPx(), top.toPx()),
             childPosition
         )
     }
 
-    private fun testSpacingWithDifferentInsetsImplementation(
+    private fun testPaddingWithDifferentInsetsImplementation(
         left: Dp,
         top: Dp,
         right: Dp,
         bottom: Dp,
-        spacingContainer: @Composable() ((@Composable() () -> Unit) -> Unit)
+        paddingContainer: @Composable() ((@Composable() () -> Unit) -> Unit)
     ) = withDensity(density) {
         val sizeDp = 50.dp
         val size = sizeDp.toIntPx()
@@ -236,7 +237,7 @@
                             })
                         }
                     }
-                    spacingContainer(children)
+                    paddingContainer(children)
                 }
             }
         }
@@ -245,32 +246,32 @@
         val root = findAndroidComposeView()
         waitForDraw(root)
 
-        val spacingLeft = left.toIntPx()
-        val spacingRight = right.toIntPx()
-        val spacingTop = top.toIntPx()
-        val spacingBottom = bottom.toIntPx()
+        val paddingLeft = left.toIntPx()
+        val paddingRight = right.toIntPx()
+        val paddingTop = top.toIntPx()
+        val paddingBottom = bottom.toIntPx()
         assertEquals(
             PxSize(
-                size - spacingLeft - spacingRight,
-                size - spacingTop - spacingBottom
+                size - paddingLeft - paddingRight,
+                size - paddingTop - paddingBottom
             ),
             childSize
         )
-        val viewLeft = ((root.width.ipx - size) / 2) + spacingLeft
-        val viewTop = ((root.height.ipx - size) / 2) + spacingTop
+        val viewLeft = ((root.width.ipx - size) / 2) + paddingLeft
+        val viewTop = ((root.height.ipx - size) / 2) + paddingTop
         assertEquals(
             PxPosition(viewLeft.toPx(), viewTop.toPx()),
             childPosition
         )
     }
 
-    private fun testSpacingWithInsufficientSpaceImplementation(
-        spacing: Dp,
-        spacingContainer: @Composable() (@Composable() () -> Unit) -> Unit
+    private fun testPaddingWithInsufficientSpaceImplementation(
+        padding: Dp,
+        paddingContainer: @Composable() (@Composable() () -> Unit) -> Unit
     ) = withDensity(density) {
         val sizeDp = 50.dp
         val size = sizeDp.toIntPx()
-        val spacingPx = spacing.toIntPx()
+        val paddingPx = padding.toIntPx()
 
         val drawLatch = CountDownLatch(1)
         var childSize = PxSize(-1.px, -1.px)
@@ -278,7 +279,7 @@
         show {
             Center {
                 ConstrainedBox(constraints = DpConstraints.tightConstraints(sizeDp, sizeDp)) {
-                    spacingContainer {
+                    paddingContainer {
                         Container {
                             OnPositioned( coordinates ->
                                 childSize = coordinates.size
@@ -296,8 +297,8 @@
         waitForDraw(root)
 
         assertEquals(PxSize(0.px, 0.px), childSize)
-        val left = ((root.width.ipx - size) / 2) + spacingPx
-        val top = ((root.height.ipx - size) / 2) + spacingPx
+        val left = ((root.width.ipx - size) / 2) + paddingPx
+        val top = ((root.height.ipx - size) / 2) + paddingPx
         assertEquals(PxPosition(left.toPx(), top.toPx()), childPosition)
     }
 

diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/PaddingTest.kt b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/PaddingTest.kt
index d1dd28a..0bcac82 100644
--- a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/PaddingTest.kt
+++ b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/PaddingTest.kt

@@ -34,7 +34,7 @@
 import androidx.ui.layout.EdgeInsets
 import androidx.ui.layout.Padding
 import androidx.compose.Composable
-import androidx.ui.layout.AspectRatio
+import androidx.ui.layout.LayoutAspectRatio
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
@@ -267,7 +267,7 @@
 
         testIntrinsics(@Composable {
             Padding(padding = padding) {
-                Container(AspectRatio(2f)) { }
+                Container(LayoutAspectRatio(2f)) { }
             }
         }) { minIntrinsicWidth, minIntrinsicHeight, maxIntrinsicWidth, maxIntrinsicHeight ->
             // Padding is applied on both sides of an axis

diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/SizeModifiersTest.kt b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/SizeModifiersTest.kt
index fef4e8f..f91ee3f 100644
--- a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/SizeModifiersTest.kt
+++ b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/SizeModifiersTest.kt

@@ -29,19 +29,19 @@
 import androidx.ui.core.ipx
 import androidx.ui.core.withDensity
 import androidx.ui.layout.Align
-import androidx.ui.layout.AspectRatio
+import androidx.ui.layout.LayoutAspectRatio
 import androidx.ui.layout.Column
 import androidx.ui.layout.Container
-import androidx.ui.layout.Height
-import androidx.ui.layout.MaxHeight
-import androidx.ui.layout.MaxSize
-import androidx.ui.layout.MaxWidth
-import androidx.ui.layout.MinHeight
-import androidx.ui.layout.MinSize
-import androidx.ui.layout.MinWidth
+import androidx.ui.layout.LayoutHeight
+import androidx.ui.layout.LayoutMaxHeight
+import androidx.ui.layout.LayoutMaxSize
+import androidx.ui.layout.LayoutMaxWidth
+import androidx.ui.layout.LayoutMinHeight
+import androidx.ui.layout.LayoutMinSize
+import androidx.ui.layout.LayoutMinWidth
 import androidx.ui.layout.Row
-import androidx.ui.layout.Size
-import androidx.ui.layout.Width
+import androidx.ui.layout.LayoutSize
+import androidx.ui.layout.LayoutWidth
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
@@ -64,27 +64,30 @@
             Align(alignment = Alignment.TopLeft) {
                 Column {
                     Container(
-                        MaxWidth(sizeDp * 2) wraps MinWidth(sizeDp) wraps Height(sizeDp)
+                        LayoutMaxWidth(sizeDp * 2) wraps LayoutMinWidth(sizeDp) wraps
+                                LayoutHeight(sizeDp)
                     ) {
                         SaveLayoutInfo(size[0], position[0], positionedLatch)
                     }
-                    Container(MaxWidth(sizeDp * 2) wraps Height(sizeDp)) {
+                    Container(LayoutMaxWidth(sizeDp * 2) wraps LayoutHeight(sizeDp)) {
                         SaveLayoutInfo(size[1], position[1], positionedLatch)
                     }
-                    Container(MinWidth(sizeDp) wraps Height(sizeDp)) {
+                    Container(LayoutMinWidth(sizeDp) wraps LayoutHeight(sizeDp)) {
                         SaveLayoutInfo(size[2], position[2], positionedLatch)
                     }
                     Container(
-                        MaxWidth(sizeDp) wraps MinWidth(sizeDp * 2) wraps Height(sizeDp)
+                        LayoutMaxWidth(sizeDp) wraps LayoutMinWidth(sizeDp * 2) wraps
+                                LayoutHeight(sizeDp)
                     ) {
                         SaveLayoutInfo(size[3], position[3], positionedLatch)
                     }
                     Container(
-                        MinWidth(sizeDp * 2) wraps MaxWidth(sizeDp) wraps Height(sizeDp)
+                        LayoutMinWidth(sizeDp * 2) wraps LayoutMaxWidth(sizeDp) wraps
+                                LayoutHeight(sizeDp)
                     ) {
                         SaveLayoutInfo(size[4], position[4], positionedLatch)
                     }
-                    Container(Width(sizeDp) wraps Height(sizeDp)) {
+                    Container(LayoutWidth(sizeDp) wraps LayoutHeight(sizeDp)) {
                         SaveLayoutInfo(size[5], position[5], positionedLatch)
                     }
                 }
@@ -123,27 +126,30 @@
             Align(alignment = Alignment.TopLeft) {
                 Row {
                     Container(
-                        MaxHeight(sizeDp * 2) wraps MinHeight(sizeDp) wraps Width(sizeDp)
+                        LayoutMaxHeight(sizeDp * 2) wraps LayoutMinHeight(sizeDp) wraps
+                                LayoutWidth(sizeDp)
                     ) {
                         SaveLayoutInfo(size[0], position[0], positionedLatch)
                     }
-                    Container(MaxHeight(sizeDp * 2) wraps Width(sizeDp)) {
+                    Container(LayoutMaxHeight(sizeDp * 2) wraps LayoutWidth(sizeDp)) {
                         SaveLayoutInfo(size[1], position[1], positionedLatch)
                     }
-                    Container(MinHeight(sizeDp) wraps Width(sizeDp)) {
+                    Container(LayoutMinHeight(sizeDp) wraps LayoutWidth(sizeDp)) {
                         SaveLayoutInfo(size[2], position[2], positionedLatch)
                     }
                     Container(
-                        MaxHeight(sizeDp) wraps MinHeight(sizeDp * 2) wraps Width(sizeDp)
+                        LayoutMaxHeight(sizeDp) wraps LayoutMinHeight(sizeDp * 2) wraps
+                                LayoutWidth(sizeDp)
                     ) {
                         SaveLayoutInfo(size[3], position[3], positionedLatch)
                     }
                     Container(
-                        MinHeight(sizeDp * 2) wraps MaxHeight(sizeDp) wraps Width(sizeDp)
+                        LayoutMinHeight(sizeDp * 2) wraps LayoutMaxHeight(sizeDp) wraps
+                                LayoutWidth(sizeDp)
                     ) {
                         SaveLayoutInfo(size[4], position[4], positionedLatch)
                     }
-                    Container(Height(sizeDp) wraps Width(sizeDp)) {
+                    Container(LayoutHeight(sizeDp) wraps LayoutWidth(sizeDp)) {
                         SaveLayoutInfo(size[5], position[5], positionedLatch)
                     }
                 }
@@ -182,28 +188,28 @@
             Align(alignment = Alignment.TopLeft) {
                 Row {
                     Container(
-                        MaxSize(sizeDp * 2, sizeDp * 2)
-                                wraps MinSize(sizeDp, sizeDp)
+                        LayoutMaxSize(sizeDp * 2, sizeDp * 2)
+                                wraps LayoutMinSize(sizeDp, sizeDp)
                     ) {
                         SaveLayoutInfo(size[0], position[0], positionedLatch)
                     }
                     Container(
-                        MaxSize(sizeDp, sizeDp) wraps MinSize(sizeDp * 2, sizeDp)
+                        LayoutMaxSize(sizeDp, sizeDp) wraps LayoutMinSize(sizeDp * 2, sizeDp)
                     ) {
                         SaveLayoutInfo(size[1], position[1], positionedLatch)
                     }
                     Container(
-                        MinSize(sizeDp, sizeDp) wraps MaxSize(sizeDp * 2, sizeDp * 2)
+                        LayoutMinSize(sizeDp, sizeDp) wraps LayoutMaxSize(sizeDp * 2, sizeDp * 2)
                     ) {
                         SaveLayoutInfo(size[2], position[2], positionedLatch)
                     }
                     Container(
-                        MinSize(sizeDp * 2, sizeDp * 2)
-                                wraps MaxSize(sizeDp, sizeDp)
+                        LayoutMinSize(sizeDp * 2, sizeDp * 2)
+                                wraps LayoutMaxSize(sizeDp, sizeDp)
                     ) {
                         SaveLayoutInfo(size[3], position[3], positionedLatch)
                     }
-                    Container(Size(sizeDp, sizeDp)) {
+                    Container(LayoutSize(sizeDp, sizeDp)) {
                         SaveLayoutInfo(size[4], position[4], positionedLatch)
                     }
                 }
@@ -243,7 +249,7 @@
                         constrainedBoxSize.value = coordinates.size
                         positionedLatch.countDown()
                     }) {
-                        Container(Width(sizeDp * 2) wraps Height(sizeDp * 3)) {
+                        Container(LayoutWidth(sizeDp * 2) wraps LayoutHeight(sizeDp * 3)) {
                             Container(expanded = true) {
                                 SaveLayoutInfo(
                                     size = childSize,
@@ -274,21 +280,22 @@
         show {
             Align(alignment = Alignment.TopLeft) {
                 Row {
-                    Container(MaxWidth(Dp.Infinity)) {
+                    Container(LayoutMaxWidth(Dp.Infinity)) {
                         Container(width = sizeDp, height = sizeDp) {
                             SaveLayoutInfo(size[0], position[0], positionedLatch)
                         }
                     }
-                    Container(MaxHeight(Dp.Infinity)) {
+                    Container(LayoutMaxHeight(Dp.Infinity)) {
                         Container(width = sizeDp, height = sizeDp) {
                             SaveLayoutInfo(size[1], position[1], positionedLatch)
                         }
                     }
-                    Container(Width(sizeDp) wraps Height(sizeDp) wraps MaxWidth(Dp.Infinity)
-                            wraps MaxHeight(Dp.Infinity)) {
+                    Container(LayoutWidth(sizeDp) wraps LayoutHeight(sizeDp) wraps
+                            LayoutMaxWidth(Dp.Infinity)
+                            wraps LayoutMaxHeight(Dp.Infinity)) {
                         SaveLayoutInfo(size[2], position[2], positionedLatch)
                     }
-                    Container(MaxSize(Dp.Infinity, Dp.Infinity)) {
+                    Container(LayoutMaxSize(Dp.Infinity, Dp.Infinity)) {
                         Container(width = sizeDp, height = sizeDp) {
                             SaveLayoutInfo(size[3], position[3], positionedLatch)
                         }
@@ -307,8 +314,8 @@
     @Test
     fun testMinWidthModifier_hasCorrectIntrinsicMeasurements() = withDensity(density) {
         testIntrinsics(@Composable {
-            Container(MinWidth(10.dp)) {
-                Container(AspectRatio(1f)) { }
+            Container(LayoutMinWidth(10.dp)) {
+                Container(LayoutAspectRatio(1f)) { }
             }
         }) { minIntrinsicWidth, minIntrinsicHeight, maxIntrinsicWidth, maxIntrinsicHeight ->
             // Min width.
@@ -337,8 +344,8 @@
     @Test
     fun testMaxWidthModifier_hasCorrectIntrinsicMeasurements() = withDensity(density) {
         testIntrinsics(@Composable {
-            Container(MaxWidth(20.dp)) {
-                Container(AspectRatio(1f)) { }
+            Container(LayoutMaxWidth(20.dp)) {
+                Container(LayoutAspectRatio(1f)) { }
             }
         }) { minIntrinsicWidth, minIntrinsicHeight, maxIntrinsicWidth, maxIntrinsicHeight ->
             // Min width.
@@ -367,8 +374,8 @@
     @Test
     fun testMinHeightModifier_hasCorrectIntrinsicMeasurements() = withDensity(density) {
         testIntrinsics(@Composable {
-            Container(MinHeight(30.dp)) {
-                Container(AspectRatio(1f)) { }
+            Container(LayoutMinHeight(30.dp)) {
+                Container(LayoutAspectRatio(1f)) { }
             }
         }) { minIntrinsicWidth, minIntrinsicHeight, maxIntrinsicWidth, maxIntrinsicHeight ->
             // Min width.
@@ -397,8 +404,8 @@
     @Test
     fun testMaxHeightModifier_hasCorrectIntrinsicMeasurements() = withDensity(density) {
         testIntrinsics(@Composable {
-            Container(MaxHeight(40.dp)) {
-                Container(AspectRatio(1f)) { }
+            Container(LayoutMaxHeight(40.dp)) {
+                Container(LayoutAspectRatio(1f)) { }
             }
         }) { minIntrinsicWidth, minIntrinsicHeight, maxIntrinsicWidth, maxIntrinsicHeight ->
             // Min width.
@@ -427,8 +434,8 @@
     @Test
     fun testWidthModifier_hasCorrectIntrinsicMeasurements() = withDensity(density) {
         testIntrinsics(@Composable {
-            Container(Width(10.dp)) {
-                Container(AspectRatio(1f)) { }
+            Container(LayoutWidth(10.dp)) {
+                Container(LayoutAspectRatio(1f)) { }
             }
         }) { minIntrinsicWidth, minIntrinsicHeight, maxIntrinsicWidth, maxIntrinsicHeight ->
             // Min width.
@@ -457,8 +464,8 @@
     @Test
     fun testHeightModifier_hasCorrectIntrinsicMeasurements() = withDensity(density) {
         testIntrinsics(@Composable {
-            Container(Height(10.dp)) {
-                Container(AspectRatio(1f)) { }
+            Container(LayoutHeight(10.dp)) {
+                Container(LayoutAspectRatio(1f)) { }
             }
         }) { minIntrinsicWidth, minIntrinsicHeight, maxIntrinsicWidth, maxIntrinsicHeight ->
             // Min width.
@@ -487,9 +494,9 @@
     @Test
     fun testWidthHeightModifiers_hasCorrectIntrinsicMeasurements() = withDensity(density) {
         testIntrinsics(@Composable {
-            Container(MinWidth(10.dp) wraps MaxWidth(20.dp) wraps MinHeight(30.dp) wraps
-                    MaxHeight(40.dp)) {
-                Container(AspectRatio(1f)) { }
+            Container(LayoutMinWidth(10.dp) wraps LayoutMaxWidth(20.dp) wraps
+                    LayoutMinHeight(30.dp) wraps LayoutMaxHeight(40.dp)) {
+                Container(LayoutAspectRatio(1f)) { }
             }
         }) { minIntrinsicWidth, minIntrinsicHeight, maxIntrinsicWidth, maxIntrinsicHeight ->
             // Min width.
@@ -518,8 +525,8 @@
     @Test
     fun testMinSizeModifier_hasCorrectIntrinsicMeasurements() = withDensity(density) {
         testIntrinsics(@Composable {
-            Container(MinSize(20.dp, 30.dp)) {
-                Container(AspectRatio(1f)) { }
+            Container(LayoutMinSize(20.dp, 30.dp)) {
+                Container(LayoutAspectRatio(1f)) { }
             }
         }) { minIntrinsicWidth, minIntrinsicHeight, maxIntrinsicWidth, maxIntrinsicHeight ->
             // Min width.
@@ -548,8 +555,8 @@
     @Test
     fun testMaxSizeModifier_hasCorrectIntrinsicMeasurements() = withDensity(density) {
         testIntrinsics(@Composable {
-            Container(MaxSize(40.dp, 50.dp)) {
-                Container(AspectRatio(1f)) { }
+            Container(LayoutMaxSize(40.dp, 50.dp)) {
+                Container(LayoutAspectRatio(1f)) { }
             }
         }) { minIntrinsicWidth, minIntrinsicHeight, maxIntrinsicWidth, maxIntrinsicHeight ->
             // Min width.
@@ -578,8 +585,8 @@
     @Test
     fun testSizeModifier_hasCorrectIntrinsicMeasurements() = withDensity(density) {
         testIntrinsics(@Composable {
-            Container(Size(40.dp, 50.dp)) {
-                Container(AspectRatio(1f)) { }
+            Container(LayoutSize(40.dp, 50.dp)) {
+                Container(LayoutAspectRatio(1f)) { }
             }
         }) { minIntrinsicWidth, minIntrinsicHeight, maxIntrinsicWidth, maxIntrinsicHeight ->
             // Min width.

diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/SpacerTest.kt b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/SpacerTest.kt
index 854f9f5..31f942b 100644
--- a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/SpacerTest.kt
+++ b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/SpacerTest.kt

@@ -26,10 +26,10 @@
 import androidx.ui.layout.Center
 import androidx.ui.layout.Container
 import androidx.ui.layout.DpConstraints
-import androidx.ui.layout.Height
+import androidx.ui.layout.LayoutHeight
 import androidx.ui.layout.Spacer
-import androidx.ui.layout.Size
-import androidx.ui.layout.Width
+import androidx.ui.layout.LayoutSize
+import androidx.ui.layout.LayoutWidth
 import com.google.common.truth.Truth
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -59,7 +59,7 @@
                     size = position.size
                     drawLatch.countDown()
                 }) {
-                    Spacer(Size(width = width, height = height))
+                    Spacer(LayoutSize(width = width, height = height))
                 }
             }
         }
@@ -92,7 +92,7 @@
                         size = position.size
                         drawLatch.countDown()
                     }) {
-                        Spacer(Size(width = width, height = height))
+                        Spacer(LayoutSize(width = width, height = height))
                     }
                 }
             }
@@ -117,7 +117,7 @@
                     size = position.size
                     drawLatch.countDown()
                 }) {
-                    Spacer(Width(width))
+                    Spacer(LayoutWidth(width))
                 }
             }
         }
@@ -149,7 +149,7 @@
                         size = position.size
                         drawLatch.countDown()
                     }) {
-                        Spacer(Width(width))
+                        Spacer(LayoutWidth(width))
                     }
                 }
             }
@@ -174,7 +174,7 @@
                     size = position.size
                     drawLatch.countDown()
                 }) {
-                    Spacer(Height(height))
+                    Spacer(LayoutHeight(height))
                 }
             }
         }
@@ -206,7 +206,7 @@
                         size = position.size
                         drawLatch.countDown()
                     }) {
-                        Spacer(Height(height))
+                        Spacer(LayoutHeight(height))
                     }
                 }
             }

diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/StackTest.kt b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/StackTest.kt
index b6e3118..8e942e7 100644
--- a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/StackTest.kt
+++ b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/StackTest.kt

@@ -16,9 +16,11 @@
 
 package androidx.ui.layout.test
 
+import androidx.compose.Composable
 import androidx.test.filters.SmallTest
-import androidx.ui.core.OnChildPositioned
+import androidx.ui.core.Alignment
 import androidx.ui.core.IntPx
+import androidx.ui.core.OnChildPositioned
 import androidx.ui.core.PxPosition
 import androidx.ui.core.PxSize
 import androidx.ui.core.Ref
@@ -30,14 +32,12 @@
 import androidx.ui.layout.ConstrainedBox
 import androidx.ui.layout.Container
 import androidx.ui.layout.DpConstraints
+import androidx.ui.layout.LayoutAspectRatio
+import androidx.ui.layout.LayoutExpanded
+import androidx.ui.layout.LayoutGravity
+import androidx.ui.layout.LayoutPadding
+import androidx.ui.layout.LayoutSize
 import androidx.ui.layout.Stack
-import androidx.compose.Composable
-import androidx.ui.core.Alignment
-import androidx.ui.layout.AspectRatio
-import androidx.ui.layout.Expanded
-import androidx.ui.layout.Gravity
-import androidx.ui.layout.Size
-import androidx.ui.layout.Spacing
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
@@ -65,7 +65,7 @@
                     positionedLatch.countDown()
                 }) {
                     Stack {
-                        Container(modifier = Gravity.BottomRight, width = sizeDp, height = sizeDp) {
+                        Container(LayoutGravity.BottomRight, width = sizeDp, height = sizeDp) {
                             SaveLayoutInfo(
                                 size = alignedChildSize,
                                 position = alignedChildPosition,
@@ -73,7 +73,7 @@
                             )
                         }
 
-                        Container(Gravity.Stretch wraps Spacing(10.dp)) {
+                        Container(LayoutGravity.Stretch wraps LayoutPadding(10.dp)) {
                             SaveLayoutInfo(
                                 size = positionedChildSize,
                                 position = positionedChildPosition,
@@ -112,7 +112,7 @@
                 }) {
                     Stack {
                         Container(
-                            modifier = Gravity.BottomRight, width = sizeDp, height = sizeDp
+                            modifier = LayoutGravity.BottomRight, width = sizeDp, height = sizeDp
                         ) {
                             SaveLayoutInfo(
                                 size = childSize[0],
@@ -121,7 +121,7 @@
                             )
                         }
                         Container(
-                            modifier = Gravity.BottomRight,
+                            modifier = LayoutGravity.BottomRight,
                             width = doubleSizeDp,
                             height = doubleSizeDp
                         ) {
@@ -163,7 +163,7 @@
                     positionedLatch.countDown()
                 }) {
                     Stack {
-                        Container(modifier = Gravity.Center, width = sizeDp, height = sizeDp) {
+                        Container(LayoutGravity.Center, width = sizeDp, height = sizeDp) {
                             SaveLayoutInfo(
                                 size = childSize[0],
                                 position = childPosition[0],
@@ -171,7 +171,10 @@
                             )
                         }
                         Container(
-                            Gravity.Stretch wraps Spacing(left = insetDp, top = insetDp),
+                            LayoutGravity.Stretch wraps LayoutPadding(
+                                left = insetDp,
+                                top = insetDp
+                            ),
                             width = halfSizeDp,
                             height = halfSizeDp
                         ) {
@@ -182,7 +185,10 @@
                             )
                         }
                         Container(
-                            Gravity.Stretch wraps Spacing(right = insetDp, bottom = insetDp),
+                            LayoutGravity.Stretch wraps LayoutPadding(
+                                right = insetDp,
+                                bottom = insetDp
+                            ),
                             width = halfSizeDp,
                             height = halfSizeDp
                         ) {
@@ -193,7 +199,10 @@
                             )
                         }
                         Container(
-                            Gravity.Stretch wraps Spacing(right = insetDp, left = insetDp),
+                            LayoutGravity.Stretch wraps LayoutPadding(
+                                left = insetDp,
+                                right = insetDp
+                            ),
                             width = halfSizeDp,
                             height = halfSizeDp) {
                             SaveLayoutInfo(
@@ -203,7 +212,10 @@
                             )
                         }
                         Container(
-                            Gravity.Stretch wraps Spacing(top = insetDp, bottom = insetDp),
+                            LayoutGravity.Stretch wraps LayoutPadding(
+                                top = insetDp,
+                                bottom = insetDp
+                            ),
                             width = halfSizeDp,
                             height = halfSizeDp
                         ) {
@@ -249,9 +261,9 @@
                     stackSize.value = coordinates.size
                     positionedLatch.countDown()
                 }) {
-                    Container(Size(sizeDp, sizeDp)) {
+                    Container(LayoutSize(sizeDp, sizeDp)) {
                         Stack {
-                            Container(Expanded) {
+                            Container(LayoutExpanded) {
                                 SaveLayoutInfo(
                                     size = childSize[0],
                                     position = childPosition[0],
@@ -259,7 +271,7 @@
                                 )
                             }
                             Container(
-                                Gravity.BottomRight,
+                                LayoutGravity.BottomRight,
                                 width = halfSizeDp,
                                 height = halfSizeDp
                             ) {
@@ -296,13 +308,14 @@
 
         testIntrinsics(@Composable {
             Stack {
-                Container(Gravity.TopLeft wraps AspectRatio(2f)) { }
+                Container(LayoutGravity.TopLeft wraps LayoutAspectRatio(2f)) { }
                 ConstrainedBox(
-                    DpConstraints.tightConstraints(testWidth, testHeight), Gravity.BottomCenter
+                    DpConstraints.tightConstraints(testWidth, testHeight),
+                    LayoutGravity.BottomCenter
                 ) { }
                 ConstrainedBox(
                     DpConstraints.tightConstraints(200.dp, 200.dp),
-                    Gravity.Stretch wraps Spacing(10.dp)
+                    LayoutGravity.Stretch wraps LayoutPadding(10.dp)
                 ) { }
             }
         }) { minIntrinsicWidth, minIntrinsicHeight, maxIntrinsicWidth, maxIntrinsicHeight ->
@@ -330,7 +343,7 @@
         testIntrinsics(@Composable {
             Stack {
                 ConstrainedBox(
-                    modifier = Gravity.Stretch wraps Spacing(10.dp),
+                    modifier = LayoutGravity.Stretch wraps LayoutPadding(10.dp),
                     constraints = DpConstraints.tightConstraints(200.dp, 200.dp)
                 ) { }
             }

diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/TableTest.kt b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/TableTest.kt
index 5beeb0e5..c7f590d7 100644
--- a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/TableTest.kt
+++ b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/TableTest.kt

@@ -31,7 +31,7 @@
 import androidx.ui.core.min
 import androidx.ui.core.withDensity
 import androidx.ui.layout.Align
-import androidx.ui.layout.AspectRatio
+import androidx.ui.layout.LayoutAspectRatio
 import androidx.ui.layout.ConstrainedBox
 import androidx.ui.layout.Container
 import androidx.ui.layout.DpConstraints
@@ -1309,7 +1309,7 @@
                     for (i in 0 until rows) {
                         tableRow {
                             for (j in 0 until columns) {
-                                Container(AspectRatio(2f)) { }
+                                Container(LayoutAspectRatio(2f)) { }
                             }
                         }
                     }
@@ -1354,7 +1354,7 @@
                     for (i in 0 until rows) {
                         tableRow {
                             for (j in 0 until columns) {
-                                Container(AspectRatio(2f)) { }
+                                Container(LayoutAspectRatio(2f)) { }
                             }
                         }
                     }
@@ -1399,7 +1399,7 @@
                     for (i in 0 until rows) {
                         tableRow {
                             for (j in 0 until columns) {
-                                Container(AspectRatio(2f)) { }
+                                Container(LayoutAspectRatio(2f)) { }
                             }
                         }
                     }
@@ -1444,7 +1444,7 @@
                     for (i in 0 until rows) {
                         tableRow {
                             for (j in 0 until columns) {
-                                Container(AspectRatio(2f)) { }
+                                Container(LayoutAspectRatio(2f)) { }
                             }
                         }
                     }
@@ -1489,7 +1489,7 @@
                     for (i in 0 until rows) {
                         tableRow {
                             for (j in 0 until columns) {
-                                Container(AspectRatio(2f)) { }
+                                Container(LayoutAspectRatio(2f)) { }
                             }
                         }
                     }
@@ -1536,7 +1536,7 @@
                     for (i in 0 until rows) {
                         tableRow {
                             for (j in 0 until columns) {
-                                Container(AspectRatio(2f)) { }
+                                Container(LayoutAspectRatio(2f)) { }
                             }
                         }
                     }
@@ -1581,7 +1581,7 @@
                     for (i in 0 until rows) {
                         tableRow {
                             for (j in 0 until columns) {
-                                Container(AspectRatio(2f)) { }
+                                Container(LayoutAspectRatio(2f)) { }
                             }
                         }
                     }

diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/WrapTest.kt b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/WrapTest.kt
index bc36812..8c9bd39 100644
--- a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/WrapTest.kt
+++ b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/WrapTest.kt

@@ -36,10 +36,10 @@
 import androidx.ui.core.Layout
 import androidx.ui.core.OnPositioned
 import androidx.ui.core.enforce
-import androidx.ui.layout.Aligned
-import androidx.ui.layout.AspectRatio
-import androidx.ui.layout.Size
-import androidx.ui.layout.Wrapped
+import androidx.ui.layout.LayoutAlign
+import androidx.ui.layout.LayoutAspectRatio
+import androidx.ui.layout.LayoutSize
+import androidx.ui.layout.LayoutWrapped
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
@@ -91,12 +91,12 @@
         val positionedLatch = CountDownLatch(2)
         val wrapSize = Ref<PxSize>()
         show {
-            Container(Wrapped) {
+            Container(LayoutWrapped) {
                 OnPositioned( coordinates ->
                     wrapSize.value = coordinates.size
                     positionedLatch.countDown()
                 })
-                Container(Size(sizeDp, sizeDp)) { }
+                Container(LayoutSize(sizeDp, sizeDp)) { }
             }
         }
         positionedLatch.await(1, TimeUnit.SECONDS)
@@ -156,14 +156,14 @@
         val childSize = Ref<PxSize>()
         val childPosition = Ref<PxPosition>()
         show {
-            Container(Aligned.TopLeft) {
+            Container(LayoutAlign.TopLeft) {
                 OnChildPositioned( coordinates ->
                     wrapSize.value = coordinates.size
                     positionedLatch.countDown()
                 }) {
                     Layout(
                         children = {
-                            Container(Wrapped wraps Size(sizeDp, sizeDp)) {
+                            Container(LayoutWrapped wraps LayoutSize(sizeDp, sizeDp)) {
                                 SaveLayoutInfo(
                                     size = childSize,
                                     position = childPosition,
@@ -242,7 +242,7 @@
     fun testWrap_hasCorrectIntrinsicMeasurements() = withDensity(density) {
         testIntrinsics(@Composable {
             Wrap {
-                Container(modifier = AspectRatio(2f)) { }
+                Container(modifier = LayoutAspectRatio(2f)) { }
             }
         }) { minIntrinsicWidth, minIntrinsicHeight, maxIntrinsicWidth, maxIntrinsicHeight ->
             // Min width.
@@ -263,7 +263,7 @@
     @Test
     fun testWrappedModifier_hasCorrectIntrinsicMeasurements() = withDensity(density) {
         testIntrinsics(@Composable {
-            Container(modifier = AspectRatio(2f) wraps Wrapped) { }
+            Container(modifier = LayoutAspectRatio(2f) wraps LayoutWrapped) { }
         }) { minIntrinsicWidth, minIntrinsicHeight, maxIntrinsicWidth, maxIntrinsicHeight ->
             // Min width.
             assertEquals(25.dp.toIntPx() * 2, minIntrinsicWidth(25.dp.toIntPx()))

diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/Align.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/Align.kt
index 1ef4221..8beb58b 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/Align.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/Align.kt

@@ -93,9 +93,9 @@
 /**
  * Provides scope-dependent alignment options for children layouts where the alignment is handled
  * by the parent layout rather than the child itself. Different layout models allow different
- * [Gravity] options. For example, [Row] provides Top and Bottom, while [Column] provides
+ * [LayoutGravity] options. For example, [Row] provides Top and Bottom, while [Column] provides
  * Start and End.
- * Unlike [Aligned], layout children with [Gravity] are aligned only after the size
+ * Unlike [LayoutAlign], layout children with [LayoutGravity] are aligned only after the size
  * of the parent is known, therefore not affecting the size of the parent in order to achieve
  * their own alignment.
  *
@@ -105,7 +105,7 @@
  *
  * @sample androidx.ui.layout.samples.SimpleGravityInColumn
  */
-object Gravity
+object LayoutGravity
 
 /**
  * Provides alignment options for a target layout where the alignment is handled by the modifier
@@ -118,7 +118,7 @@
  * @sample androidx.ui.layout.samples.SimpleAlignedModifier
  * @sample androidx.ui.layout.samples.SimpleVerticallyAlignedModifier
  */
-object Aligned {
+object LayoutAlign {
     /**
      * A layout modifier that positions the target component inside its parent to the top in
      * vertical direction and wraps the component in horizontal direction.

diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/AspectRatio.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/AspectRatio.kt
index 76529d1..d39f868 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/AspectRatio.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/AspectRatio.kt

@@ -45,20 +45,14 @@
  * Example usage:
  * @sample androidx.ui.layout.samples.SimpleAspectRatio
  *
- * @param value A positive non-zero value representing the aspect ratio.
+ * @param aspectRatio A positive non-zero value representing the aspect ratio.
  */
-fun AspectRatio(
-    @FloatRange(from = 0.0, fromInclusive = false) value: Float
-): LayoutModifier = AspectRatioModifier(value)
-
-/**
- * A [LayoutModifier] that applies an aspect ratio to the wrapped UI element's size.
- */
-private data class AspectRatioModifier(val aspectRatio: Float) : LayoutModifier {
+data class LayoutAspectRatio(
+    @FloatRange(from = 0.0, fromInclusive = false)
+    val aspectRatio: Float
+) : LayoutModifier {
     init {
-        require(aspectRatio > 0) {
-            "Received aspect ratio value $aspectRatio is expected to be positive non-zero."
-        }
+        require(aspectRatio > 0) { "aspectRatio $aspectRatio must be > 0" }
     }
 
     override fun DensityScope.modifyConstraints(constraints: Constraints): Constraints {

diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/ExpandedModifier.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/ExpandedModifier.kt
index 3d70787..6d24e01 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/ExpandedModifier.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/ExpandedModifier.kt

@@ -29,7 +29,7 @@
  * Example usage:
  * @sample androidx.ui.layout.samples.SimpleExpandedWidthModifier
  */
-val ExpandedWidth: LayoutModifier = object : LayoutModifier {
+val LayoutExpandedWidth: LayoutModifier = object : LayoutModifier {
     override fun DensityScope.modifyConstraints(constraints: Constraints): Constraints {
         return if (constraints.hasBoundedWidth) {
             constraints.withTight(width = constraints.maxWidth)
@@ -45,7 +45,7 @@
  * Example usage:
  * @sample androidx.ui.layout.samples.SimpleExpandedHeightModifier
  */
-val ExpandedHeight: LayoutModifier = object : LayoutModifier {
+val LayoutExpandedHeight: LayoutModifier = object : LayoutModifier {
     override fun DensityScope.modifyConstraints(constraints: Constraints): Constraints {
         return if (constraints.hasBoundedHeight) {
             constraints.withTight(height = constraints.maxHeight)
@@ -61,7 +61,7 @@
  * Example usage:
  * @sample androidx.ui.layout.samples.SimpleExpandedModifier
  */
-val Expanded: LayoutModifier = object : LayoutModifier {
+val LayoutExpanded: LayoutModifier = object : LayoutModifier {
     override fun DensityScope.modifyConstraints(constraints: Constraints): Constraints {
         return if (constraints.hasBoundedWidth && constraints.hasBoundedHeight) {
             Constraints.tightConstraints(constraints.maxWidth, constraints.maxHeight)

diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/Flex.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/Flex.kt
index 3f4a401..77d4155 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/Flex.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/Flex.kt

@@ -171,11 +171,11 @@
      * A layout modifier within a [Column] or [Row] that makes the target component flexible.
      * It will be assigned a space according to its flex weight relative to the flexible siblings.
      * When [tight] is set to true, the target component is forced to occupy the entire space
-     * assigned to it by the parent. [Flexible] children will be measured after all the
-     * [Inflexible] ones have been measured, in order to divide the unclaimed space between
+     * assigned to it by the parent. [LayoutFlexible] children will be measured after all the
+     * [LayoutInflexible] ones have been measured, in order to divide the unclaimed space between
      * them.
      */
-    fun Flexible(
+    fun LayoutFlexible(
         @FloatRange(from = 0.0, fromInclusive = false) flex: Float,
         tight: Boolean = true
     ): LayoutModifier {
@@ -189,15 +189,15 @@
 
     /**
      * A layout modifier within a [Column] or [Row] that makes the target component inflexible.
-     * All [Inflexible] children will be measured before the [Flexible] ones. They will be
-     * measured in the order they appear, without min constraints and with max constraints in
+     * All [LayoutInflexible] children will be measured before the [LayoutFlexible] ones. They will
+     * be measured in the order they appear, without min constraints and with max constraints in
      * the main direction of the layout (maxHeight for Column and maxWidth for Row) such that
      * the sum of the space occupied by inflexible children will not exceed the incoming constraint
      * of the [Column] or [Row]: for example the first child of a [Column] will be measured with
      * maxHeight = column's maxHeight; the second child will be measured with maxHeight = column's
      * maxHeight - first child's height, and so on.
      */
-    val Inflexible: LayoutModifier = inflexibleModifier
+    val LayoutInflexible: LayoutModifier = inflexibleModifier
 
     internal companion object {
         val inflexibleModifier: LayoutModifier = FlexModifier(
@@ -211,13 +211,14 @@
      * [alignmentLineBlock].
      * If target component is the only component with the specified RelativeToSiblings modifier
      * within a Column or Row, then the component will be positioned using
-     * [ColumnScope.Gravity.Start] in Column or [RowScope.Gravity.Top] in Row respectively.
+     * [LayoutGravity.Start][ColumnScope.Start] in Column or [LayoutGravity.Top][RowScope.Top] in
+     * Row respectively.
      *
      * Example usage:
      * @sample androidx.ui.layout.samples.SimpleRelativeToSiblings
      */
     @Suppress("unused")
-    fun Gravity.RelativeToSiblings(alignmentLineBlock: (Placeable) -> IntPx): LayoutModifier =
+    fun LayoutGravity.RelativeToSiblings(alignmentLineBlock: (Placeable) -> IntPx): LayoutModifier =
         SiblingsAlignedModifier.WithAlignmentLineBlock(alignmentLineBlock)
 }
 
@@ -231,29 +232,29 @@
      * so that its start edge is aligned to the start edge of the horizontal axis.
      */
     // TODO: Consider ltr/rtl.
-    val Gravity.Start: LayoutModifier get() = StartGravityModifier
+    val LayoutGravity.Start: LayoutModifier get() = StartGravityModifier
     /**
      * A layout modifier within a Column that positions target component in a horizontal direction
      * so that its center is in the middle of the horizontal axis.
      */
-    val Gravity.Center: LayoutModifier get() = CenterGravityModifier
+    val LayoutGravity.Center: LayoutModifier get() = CenterGravityModifier
     /**
      * A layout modifier within a Column that positions target component in a horizontal direction
      * so that its end edge is aligned to the end edge of the horizontal axis.
      */
-    val Gravity.End: LayoutModifier get() = EndGravityModifier
+    val LayoutGravity.End: LayoutModifier get() = EndGravityModifier
     /**
      * A layout modifier within a [Column] that positions target component in a perpendicular
      * direction according to the [AlignmentLine].
      * If target component is the only component within a Column with the specified
      * RelativeToSiblings modifier, or if the provided alignment line is not defined for the
-     * component, the component will be positioned using [Gravity.Start].
+     * component, the component will be positioned using [LayoutGravity.Start].
      *
      * Example usage:
      *
      * @sample androidx.ui.layout.samples.SimpleRelativeToSiblingsInColumn
      */
-    fun Gravity.RelativeToSiblings(alignmentLine: VerticalAlignmentLine): LayoutModifier =
+    fun LayoutGravity.RelativeToSiblings(alignmentLine: VerticalAlignmentLine): LayoutModifier =
         SiblingsAlignedModifier.WithAlignmentLine(alignmentLine)
 
     internal companion object {
@@ -272,28 +273,28 @@
      * A layout modifier within a Row that positions target component in a vertical direction
      * so that its top edge is aligned to the top edge of the vertical axis.
      */
-    val Gravity.Top: LayoutModifier get() = TopGravityModifier
+    val LayoutGravity.Top: LayoutModifier get() = TopGravityModifier
     /**
      * A layout modifier within a Row that positions target component in a vertical direction
      * so that its center is in the middle of the vertical axis.
      */
-    val Gravity.Center: LayoutModifier get() = CenterGravityModifier
+    val LayoutGravity.Center: LayoutModifier get() = CenterGravityModifier
     /**
      * A layout modifier within a Row that positions target component in a vertical direction
      * so that its bottom edge is aligned to the bottom edge of the vertical axis.
      */
-    val Gravity.Bottom: LayoutModifier get() = BottomGravityModifier
+    val LayoutGravity.Bottom: LayoutModifier get() = BottomGravityModifier
     /**
      * A layout modifier within a [Row] that positions target component in a perpendicular
      * direction according to the [AlignmentLine].
      * If target component is the only component within a Row with the specified
      * RelativeToSiblings modifier, or if the provided alignment line is not defined for the
-     * component, the component will be positioned using [Gravity.Top].
+     * component, the component will be positioned using [LayoutGravity.Top].
      *
      * Example usage:
      * @sample androidx.ui.layout.samples.SimpleRelativeToSiblingsInRow
      */
-    fun Gravity.RelativeToSiblings(alignmentLine: HorizontalAlignmentLine): LayoutModifier =
+    fun LayoutGravity.RelativeToSiblings(alignmentLine: HorizontalAlignmentLine): LayoutModifier =
         SiblingsAlignedModifier.WithAlignmentLine(alignmentLine)
 
     internal companion object {
@@ -305,9 +306,9 @@
 
 /**
  * A composable that places its children in a horizontal sequence and is able to assign them widths
- * according to their flex weights provided through [androidx.ui.layout.FlexScope.Flexible]
+ * according to their flex weights provided through [androidx.ui.layout.FlexScope.LayoutFlexible]
  * modifier.
- * If [androidx.ui.layout.FlexScope.Inflexible] or no modifier is provided, the child will be
+ * If [androidx.ui.layout.FlexScope.LayoutInflexible] or no modifier is provided, the child will be
  * treated as inflexible, and will be sized to its preferred width.
  *
  * Example usage:
@@ -335,9 +336,9 @@
 
 /**
  * A composable that places its children in a vertical sequence and is able to assign them heights
- * according to their flex weights provided through [androidx.ui.layout.FlexScope.Flexible]
+ * according to their flex weights provided through [androidx.ui.layout.FlexScope.LayoutFlexible]
  * modifiers.
- * If [androidx.ui.layout.FlexScope.Inflexible] or no modifier is provided, the child will be
+ * If [androidx.ui.layout.FlexScope.LayoutInflexible] or no modifier is provided, the child will be
  * treated as inflexible, and will be sized to its preferred height.
  *
  * Example usage:
@@ -376,6 +377,7 @@
 /**
  * Used to specify how a layout chooses its own size when multiple behaviors are possible.
  */
+// TODO Rename? Layout prefix should be reserved for LayoutModifiers.
 enum class LayoutSize {
     /**
      * Minimize the amount of free space by wrapping the children,

diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/Intrinsic.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/Intrinsic.kt
index b3ac166..bcdcc16 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/Intrinsic.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/Intrinsic.kt

@@ -165,13 +165,13 @@
  *
  * @sample androidx.ui.layout.samples.MatchParentDividerForAspectRatio
  *
- * The sample builds a layout containing two [AspectRatio]s separated by a divider, where the
- * divider is sized according to the height of the taller [AspectRatio].
+ * The sample builds a layout containing two [LayoutAspectRatio]s separated by a divider, where the
+ * divider is sized according to the height of the taller [LayoutAspectRatio].
  *
  * Here [MaxIntrinsicHeight] is adding a speculative height measurement pass for the [FlexRow],
- * whose maximum intrinsic height will correspond to the height of the taller [AspectRatio]. Then
+ * whose maximum intrinsic height will correspond to the height of the taller [LayoutAspectRatio]. Then
  * [MaxIntrinsicHeight] will measure the [FlexRow] with tight height, the same as the premeasured
- * maximum intrinsic height, which due to [CrossAxisAlignment.Stretch] will force the [AspectRatio]s
+ * maximum intrinsic height, which due to [CrossAxisAlignment.Stretch] will force the [LayoutAspectRatio]s
  * and the divider to use the same height.
  */
 @Composable

diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/Spacing.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/Padding.kt
similarity index 85%
rename from ui/ui-layout/src/main/java/androidx/ui/layout/Spacing.kt
rename to ui/ui-layout/src/main/java/androidx/ui/layout/Padding.kt
index ff997af..599d57a 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/Spacing.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/Padding.kt

@@ -33,31 +33,57 @@
  * Layout modifier that applies whitespace spacing on specified sides of the target layout.
  *
  * Example usage:
- * @sample androidx.ui.layout.samples.SpacingModifier
+ * @sample androidx.ui.layout.samples.LayoutPaddingModifier
  */
+@Deprecated(
+    "use LayoutPadding",
+    replaceWith = ReplaceWith(
+        "LayoutPadding(left, top, right, bottom)",
+        "androidx.ui.layout.LayoutPadding"
+    )
+)
 fun Spacing(
     left: Dp = 0.dp,
     top: Dp = 0.dp,
     right: Dp = 0.dp,
     bottom: Dp = 0.dp
-): LayoutModifier = SpacingModifier(left = left, top = top, right = right, bottom = bottom)
+): LayoutModifier = LayoutPadding(left = left, top = top, right = right, bottom = bottom)
 
 /**
  * Layout modifier that applies the same whitespace spacing of [all] dp on each side
  * of the target layout.
  *
  * Example usage:
- * @sample androidx.ui.layout.samples.SpacingAllModifier
+ * @sample androidx.ui.layout.samples.LayoutPaddingAllModifier
  */
+@Deprecated(
+    "use LayoutPadding",
+    replaceWith = ReplaceWith(
+        "LayoutPadding(all)",
+        "androidx.ui.layout.LayoutPadding"
+    )
+)
 fun Spacing(all: Dp = 0.dp): LayoutModifier =
-    SpacingModifier(left = all, top = all, right = all, bottom = all)
+    LayoutPadding(left = all, top = all, right = all, bottom = all)
+
+/**
+ * Layout modifier that applies the same padding of [all] dp on each side of the target layout.
+ *
+ * Example usage:
+ * @sample androidx.ui.layout.samples.LayoutPaddingAllModifier
+ */
+fun LayoutPadding(all: Dp): LayoutPadding = LayoutPadding(
+    left = all,
+    top = all,
+    right = all,
+    bottom = all
+)
 
 /**
  * A [LayoutModifier] that adds [left], [top], [right] and [bottom] padding
  * to the wrapped layout.
- * Used as shared implementation for the [Spacing] overloads.
  */
-private data class SpacingModifier(
+data class LayoutPadding(
     val left: Dp = 0.dp,
     val top: Dp = 0.dp,
     val right: Dp = 0.dp,

diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/SizeModifiers.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/SizeModifiers.kt
index f98cec6..c480ee4 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/SizeModifiers.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/SizeModifiers.kt

@@ -31,10 +31,10 @@
  *
  * @sample androidx.ui.layout.samples.SimpleSizeModifier
  *
- * If the [Size] modifier's target layout is measured with constraints that do not allow the
+ * If the [LayoutSize] modifier's target layout is measured with constraints that do not allow the
  * specified width and/or height, the size will be coerced inside the incoming constraints.
  */
-fun Size(width: Dp, height: Dp): LayoutModifier {
+fun LayoutSize(width: Dp, height: Dp): LayoutModifier {
     require(width.isFinite() && height.isFinite()) {
         "Width and height parameters should be finite."
     }
@@ -44,11 +44,11 @@
 /**
  * A layout modifier that sets the minimum width and height of the component.
  *
- * If the [MinSize] modifier's target layout is measured with constraints that do not allow the
- * specified minimum width and/or height, the minimum size will be coerced inside the incoming
+ * If the [LayoutMinSize] modifier's target layout is measured with constraints that do not allow
+ * the specified minimum width and/or height, the minimum size will be coerced inside the incoming
  * constraints.
  */
-fun MinSize(minWidth: Dp, minHeight: Dp): LayoutModifier {
+fun LayoutMinSize(minWidth: Dp, minHeight: Dp): LayoutModifier {
     require(minWidth.isFinite() && minHeight.isFinite()) {
         "MinWidth and minHeight parameters should be finite."
     }
@@ -58,11 +58,11 @@
 /**
  * A layout modifier that sets the maximum width and height of the component.
  *
- * If the [MaxSize] modifier's target layout is measured with constraints that do not allow the
- * specified maximum width and/or height, the maximum size will be coerced inside the incoming
+ * If the [LayoutMaxSize] modifier's target layout is measured with constraints that do not allow
+ * the specified maximum width and/or height, the maximum size will be coerced inside the incoming
  * constraints.
  */
-fun MaxSize(maxWidth: Dp, maxHeight: Dp): LayoutModifier =
+fun LayoutMaxSize(maxWidth: Dp, maxHeight: Dp): LayoutModifier =
     SizeModifier(DpConstraints(maxWidth = maxWidth, maxHeight = maxHeight))
 
 /**
@@ -70,10 +70,10 @@
  *
  * @sample androidx.ui.layout.samples.SimpleWidthModifier
  *
- * If the [Width] modifier's target layout is measured with constraints that do not allow the
+ * If the [LayoutWidth] modifier's target layout is measured with constraints that do not allow the
  * specified width, the width will be coerced inside the incoming constraints.
  */
-fun Width(value: Dp): LayoutModifier {
+fun LayoutWidth(value: Dp): LayoutModifier {
     require(value.isFinite()) { "Width value parameter should be finite." }
     return SizeModifier(DpConstraints.tightConstraintsForWidth(value))
 }
@@ -81,10 +81,11 @@
 /**
  * A layout modifier that sets the minimum width of the component.
  *
- * If the [MinWidth] modifier's target layout is measured with constraints that do not allow the
- * specified minimum width, the minimum width will be coerced inside the incoming constraints.
+ * If the [LayoutMinWidth] modifier's target layout is measured with constraints that do not
+ * allow the specified minimum width, the minimum width will be coerced inside the incoming
+ * constraints.
  */
-fun MinWidth(value: Dp): LayoutModifier {
+fun LayoutMinWidth(value: Dp): LayoutModifier {
     require(value.isFinite()) { "MinWidth value parameter should be finite." }
     return SizeModifier(DpConstraints(minWidth = value))
 }
@@ -92,20 +93,21 @@
 /**
  * A layout modifier that sets the maximum width of the component.
  *
- * If the [MaxWidth] modifier's target layout is measured with constraints that do not allow the
- * specified maximum width, the maximum width will be coerced inside the incoming constraints.
+ * If the [LayoutMaxWidth] modifier's target layout is measured with constraints that do not
+ * allow the specified maximum width, the maximum width will be coerced inside the incoming
+ * constraints.
  */
-fun MaxWidth(value: Dp): LayoutModifier = SizeModifier(DpConstraints(maxWidth = value))
+fun LayoutMaxWidth(value: Dp): LayoutModifier = SizeModifier(DpConstraints(maxWidth = value))
 
 /**
  * A layout modifier that sets the exact height of the component.
  *
  * @sample androidx.ui.layout.samples.SimpleHeightModifier
  *
- * If the [Height] modifier's target layout is measured with constraints that do not allow the
+ * If the [LayoutHeight] modifier's target layout is measured with constraints that do not allow the
  * specified height, the height will be coerced inside the incoming constraints.
  */
-fun Height(value: Dp): LayoutModifier {
+fun LayoutHeight(value: Dp): LayoutModifier {
     require(value.isFinite()) { "Height value parameter should be finite." }
     return SizeModifier(DpConstraints.tightConstraintsForHeight(value))
 }
@@ -113,10 +115,11 @@
 /**
  * A layout modifier that sets the minimum height of the component.
  *
- * If the [MinHeight] modifier's target layout is measured with constraints that do not allow the
- * specified minimum height, the minimum height will be coerced inside the incoming constraints.
+ * If the [LayoutMinHeight] modifier's target layout is measured with constraints that do not
+ * allow the specified minimum height, the minimum height will be coerced inside the incoming
+ * constraints.
  */
-fun MinHeight(value: Dp): LayoutModifier {
+fun LayoutMinHeight(value: Dp): LayoutModifier {
     require(value.isFinite()) { "MinHeight value parameter should be finite." }
     return SizeModifier(DpConstraints(minHeight = value))
 }
@@ -124,10 +127,11 @@
 /**
  * A layout modifier that sets the maximum height of the component.
  *
- * If the [MaxHeight] modifier's target layout is measured with constraints that do not allow the
- * specified maximum height, the maximum height will be coerced inside the incomingL constraints.
+ * If the [LayoutMaxHeight] modifier's target layout is measured with constraints that do not
+ * allow the specified maximum height, the maximum height will be coerced inside the incoming
+ * constraints.
  */
-fun MaxHeight(value: Dp): LayoutModifier = SizeModifier(DpConstraints(maxHeight = value))
+fun LayoutMaxHeight(value: Dp): LayoutModifier = SizeModifier(DpConstraints(maxHeight = value))
 
 private data class SizeModifier(private val modifierConstraints: DpConstraints) : LayoutModifier {
     override fun DensityScope.modifyConstraints(constraints: Constraints) =

diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/Spacer.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/Spacer.kt
index 170b457..565687c 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/Spacer.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/Spacer.kt

@@ -20,8 +20,8 @@
 import androidx.ui.core.Modifier
 
 /**
- * Component that represents an empty space layout, whose size can be defined using the [Width],
- * [Height] and [Size] modifiers.
+ * Component that represents an empty space layout, whose size can be defined using the [LayoutWidth],
+ * [LayoutHeight] and [LayoutSize] modifiers.
  *
  * @sample androidx.ui.layout.samples.SpacerExample
  *

diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/Stack.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/Stack.kt
index 0272b7c..2895bd3 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/Stack.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/Stack.kt

@@ -35,7 +35,7 @@
  * A composable that positions its children relative to its edges.
  * The component is useful for drawing children that overlap. The children will always be
  * drawn in the order they are specified in the body of the [Stack].
- * Use [Gravity] options to define how to position a target component inside the [Stack] box.
+ * Use [LayoutGravity] options to define how to position a target component inside the [Stack] box.
  *
  * Example usage:
  *
@@ -102,28 +102,28 @@
      * size of the [Stack] and are positioned within the stack after its size is calculated to
      * wrap the non-stretch components.
      */
-    val Gravity.Stretch: LayoutModifier get() = StretchGravityModifier
+    val LayoutGravity.Stretch: LayoutModifier get() = StretchGravityModifier
 
     /**
      * A layout modifier that defines that child should be positioned top-left inside the [Stack].
      * If the [Stack] wraps its content (by not being constrained to a min size by its own
      * parent), a child with this gravity option will contribute to the size of the [Stack].
     */
-    val Gravity.TopLeft: LayoutModifier get() = TopLeftGravityModifier
+    val LayoutGravity.TopLeft: LayoutModifier get() = TopLeftGravityModifier
 
     /**
      * A layout modifier that defines that child should be positioned top-center inside the [Stack].
      * If the [Stack] wraps its content (by not being constrained to a min size by its own
      * parent), a child with this gravity option will contribute to the size of the [Stack].
      */
-    val Gravity.TopCenter: LayoutModifier get() = TopCenterGravityModifier
+    val LayoutGravity.TopCenter: LayoutModifier get() = TopCenterGravityModifier
 
     /**
      * A layout modifier that defines that child should be positioned top-right inside the [Stack].
      * If the [Stack] wraps its content (by not being constrained to a min size by its own
      * parent), a child with this gravity option will contribute to the size of the [Stack].
      */
-    val Gravity.TopRight: LayoutModifier get() = TopRightGravityModifier
+    val LayoutGravity.TopRight: LayoutModifier get() = TopRightGravityModifier
 
     /**
      * A layout modifier that defines that child should be positioned center-left inside the
@@ -131,14 +131,14 @@
      * If the [Stack] wraps its content (by not being constrained to a min size by its own
      * parent), a child with this gravity option will contribute to the size of the [Stack].
      */
-    val Gravity.CenterLeft: LayoutModifier get() = CenterLeftGravityModifier
+    val LayoutGravity.CenterLeft: LayoutModifier get() = CenterLeftGravityModifier
 
     /**
      * A layout modifier that defines that child should be positioned in the center of the [Stack].
      * If the [Stack] wraps its content (by not being constrained to a min size by its own
      * parent), a child with this gravity option will contribute to the size of the [Stack].
      */
-    val Gravity.Center: LayoutModifier get() = CenterGravityModifier
+    val LayoutGravity.Center: LayoutModifier get() = CenterGravityModifier
 
     /**
      * A layout modifier that defines that child should be positioned center-right inside the
@@ -146,7 +146,7 @@
      * If the [Stack] wraps its content (by not being constrained to a min size by its own
      * parent), a child with this gravity option will contribute to the size of the [Stack].
      */
-    val Gravity.CenterRight: LayoutModifier get() = CenterRightGravityModifier
+    val LayoutGravity.CenterRight: LayoutModifier get() = CenterRightGravityModifier
 
     /**
      * A layout modifier that defines that child should be positioned bottom-left inside the
@@ -154,7 +154,7 @@
      * If the [Stack] wraps its content (by not being constrained to a min size by its own
      * parent), a child with this gravity option will contribute to the size of the [Stack].
      */
-    val Gravity.BottomLeft: LayoutModifier get() = BottomLeftGravityModifier
+    val LayoutGravity.BottomLeft: LayoutModifier get() = BottomLeftGravityModifier
 
     /**
      * A layout modifier that defines that child should be positioned bottom-center inside the
@@ -162,7 +162,7 @@
      * If the [Stack] wraps its content (by not being constrained to a min size by its own
      * parent), a child with this gravity option will contribute to the size of the [Stack].
      */
-    val Gravity.BottomCenter: LayoutModifier get() = BottomCenterGravityModifier
+    val LayoutGravity.BottomCenter: LayoutModifier get() = BottomCenterGravityModifier
 
     /**
      * A layout modifier that defines that child should be positioned bottom-right inside the
@@ -170,7 +170,7 @@
      * If the [Stack] wraps its content (by not being constrained to a min size by its own
      * parent), a child with this gravity option will contribute to the size of the [Stack].
      */
-    val Gravity.BottomRight: LayoutModifier get() = BottomRightGravityModifier
+    val LayoutGravity.BottomRight: LayoutModifier get() = BottomRightGravityModifier
 
     internal companion object {
         val TopLeftGravityModifier: LayoutModifier = StackGravityModifier(Alignment.TopLeft)

diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/Wrap.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/Wrap.kt
index bcec4fe..aff79be 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/Wrap.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/Wrap.kt

@@ -66,7 +66,7 @@
  * the target layout is smaller than the incoming min constraints, the modified component will
  * size itself to min incoming constraints and place its content in the center.
  */
-val Wrapped: LayoutModifier = object : LayoutModifier {
+val LayoutWrapped: LayoutModifier = object : LayoutModifier {
     override fun DensityScope.modifyConstraints(constraints: Constraints) = constraints.looseMin()
 
     override fun DensityScope.modifySize(

diff --git a/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/AppBarActivity.kt b/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/AppBarActivity.kt
index 69edd80..0ccf58b 100644
--- a/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/AppBarActivity.kt
+++ b/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/AppBarActivity.kt

@@ -26,7 +26,7 @@
 import androidx.ui.layout.Arrangement
 import androidx.ui.layout.Column
 import androidx.ui.layout.Container
-import androidx.ui.layout.ExpandedHeight
+import androidx.ui.layout.LayoutExpandedHeight
 import androidx.ui.layout.FlexColumn
 import androidx.ui.material.MaterialTheme
 import androidx.ui.material.RadioGroup
@@ -89,7 +89,7 @@
                 }
             }
             flexible(1f) {
-                Column(ExpandedHeight, arrangement = Arrangement.SpaceBetween) {
+                Column(LayoutExpandedHeight, arrangement = Arrangement.SpaceBetween) {
                     DemoText("TopAppBar options")
                     RadioGroup {
                         topAppBarOptions.forEach { topAppBar ->

diff --git a/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/ButtonActivity.kt b/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/ButtonActivity.kt
index ffe2ce7..0db0e03 100644
--- a/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/ButtonActivity.kt
+++ b/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/ButtonActivity.kt

@@ -38,7 +38,7 @@
 import androidx.ui.layout.Arrangement
 import androidx.ui.layout.Center
 import androidx.ui.layout.Column
-import androidx.ui.layout.ExpandedHeight
+import androidx.ui.layout.LayoutExpandedHeight
 import androidx.ui.material.Button
 import androidx.ui.material.ContainedButtonStyle
 import androidx.ui.material.MaterialTheme
@@ -53,7 +53,7 @@
     override fun materialContent() {
         val onClick: () -> Unit = { Log.e("ButtonDemo", "onClick") }
         Center {
-            Column(ExpandedHeight, arrangement = Arrangement.SpaceEvenly) {
+            Column(LayoutExpandedHeight, arrangement = Arrangement.SpaceEvenly) {
                 ContainedButtonSample(onClick)
 
                 OutlinedButtonSample(onClick)

diff --git a/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/CustomShapeActivity.kt b/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/CustomShapeActivity.kt
index 49cc2a5..c1998ad 100644
--- a/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/CustomShapeActivity.kt
+++ b/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/CustomShapeActivity.kt

@@ -24,7 +24,7 @@
 import androidx.ui.foundation.shape.GenericShape
 import androidx.ui.foundation.shape.border.Border
 import androidx.ui.graphics.Color
-import androidx.ui.layout.Size
+import androidx.ui.layout.LayoutSize
 import androidx.ui.layout.Spacer
 import androidx.ui.layout.Wrap
 import androidx.ui.material.Button
@@ -48,7 +48,7 @@
                     border = Border(Color.DarkGray, 1.dp)
                 )
             ) {
-                Spacer(Size(100.dp, 100.dp))
+                Spacer(LayoutSize(100.dp, 100.dp))
             }
         }
     }

diff --git a/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/DividersSpacersActivity.kt b/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/DividersSpacersActivity.kt
index badd47c..675d246 100644
--- a/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/DividersSpacersActivity.kt
+++ b/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/DividersSpacersActivity.kt

@@ -25,11 +25,11 @@
 import androidx.ui.layout.Column
 import androidx.ui.layout.Container
 import androidx.ui.layout.EdgeInsets
-import androidx.ui.layout.Gravity
-import androidx.ui.layout.Height
+import androidx.ui.layout.LayoutGravity
+import androidx.ui.layout.LayoutHeight
 import androidx.ui.layout.Spacer
 import androidx.ui.layout.Row
-import androidx.ui.layout.Width
+import androidx.ui.layout.LayoutWidth
 import androidx.ui.material.Divider
 import androidx.ui.material.MaterialTheme
 
@@ -61,9 +61,9 @@
                     }
                 }
             }
-            Spacer(Height(30.dp))
+            Spacer(LayoutHeight(30.dp))
             Divider(height = 2.dp, color = blackColor)
-            Spacer(Height(10.dp))
+            Spacer(LayoutHeight(10.dp))
             Column {
                 items.forEach { text ->
                     Item(text = text)
@@ -84,11 +84,11 @@
                         width = avatarSize,
                         height = avatarSize,
                         color = color,
-                        modifier = Gravity.Center
+                        modifier = LayoutGravity.Center
                     )
-                    Spacer(Width(ItemPadding))
+                    Spacer(LayoutWidth(ItemPadding))
                 }
-                Text(text = text, style = textStyle, modifier = Gravity.Center)
+                Text(text = text, style = textStyle, modifier = LayoutGravity.Center)
             }
         }
     }

diff --git a/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/DynamicThemeActivity.kt b/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/DynamicThemeActivity.kt
index ec30f46..53ab4b0 100644
--- a/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/DynamicThemeActivity.kt
+++ b/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/DynamicThemeActivity.kt

@@ -36,11 +36,11 @@
 import androidx.ui.graphics.toArgb
 import androidx.ui.layout.Column
 import androidx.ui.layout.Container
-import androidx.ui.layout.Expanded
-import androidx.ui.layout.ExpandedWidth
+import androidx.ui.layout.LayoutExpanded
+import androidx.ui.layout.LayoutExpandedWidth
 import androidx.ui.layout.FlexColumn
-import androidx.ui.layout.Gravity
-import androidx.ui.layout.Height
+import androidx.ui.layout.LayoutGravity
+import androidx.ui.layout.LayoutHeight
 import androidx.ui.layout.Spacer
 import androidx.ui.layout.Padding
 import androidx.ui.layout.Stack
@@ -92,8 +92,8 @@
 @Composable
 private fun DynamicThemeApp(scrollFraction: ScrollFraction, palette: ColorPalette) {
     MaterialTheme(palette) {
-        Stack(Expanded) {
-            FlexColumn(Expanded) {
+        Stack(LayoutExpanded) {
+            FlexColumn(LayoutExpanded) {
                 inflexible {
                     TopBar()
                 }
@@ -104,7 +104,7 @@
                     }
                 }
             }
-            Container(Gravity.BottomCenter) {
+            Container(LayoutGravity.BottomCenter) {
                 BottomBar(scrollFraction)
             }
         }
@@ -147,7 +147,7 @@
             val shapeColor = lerp(Color(0xFF303030), Color.White, index / 19f)
             val textColor = lerp(Color.White, Color(0xFF303030), index / 19f)
             Padding(25.dp) {
-                Container(ExpandedWidth, height = 150.dp) {
+                Container(LayoutExpandedWidth, height = 150.dp) {
                     // TODO: ideally this would be a Card but currently Surface consumes every
                     // colour from the Material theme to work out text colour, so we end up doing a
                     // large amount of work here when the top level theme changes
@@ -156,7 +156,7 @@
                 }
             }
         }
-        Spacer(Height(100.dp))
+        Spacer(LayoutHeight(100.dp))
     }
 }
 

diff --git a/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/FloatingActionButtonActivity.kt b/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/FloatingActionButtonActivity.kt
index 3e5b000..b042402 100644
--- a/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/FloatingActionButtonActivity.kt
+++ b/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/FloatingActionButtonActivity.kt

@@ -22,8 +22,8 @@
 import androidx.ui.layout.Arrangement
 import androidx.ui.layout.Center
 import androidx.ui.layout.Column
-import androidx.ui.layout.ExpandedHeight
-import androidx.ui.layout.Gravity
+import androidx.ui.layout.LayoutExpandedHeight
+import androidx.ui.layout.LayoutGravity
 import androidx.ui.material.FloatingActionButton
 
 class FloatingActionButtonActivity : MaterialDemoActivity() {
@@ -33,17 +33,18 @@
         val icon = imageFromResource(resources, R.drawable.ic_favorite)
         Center {
             val onClick: () -> Unit = { Log.e("FABDemo", "onClick") }
-            Column(ExpandedHeight, arrangement = Arrangement.SpaceEvenly) {
-                FloatingActionButton(icon = icon,  modifier = Gravity.Center)
+            Column(LayoutExpandedHeight, arrangement = Arrangement.SpaceEvenly) {
+                FloatingActionButton(icon = icon, >
+                    modifier = LayoutGravity.Center)
                 FloatingActionButton(
                     text = "EXTENDED",
                     >
-                    modifier = Gravity.Center
+                    modifier = LayoutGravity.Center
                 )
                 FloatingActionButton(
                     icon = icon, text = "ADD TO FAVS",
                     >
-                    modifier = Gravity.Center
+                    modifier = LayoutGravity.Center
                 )
             }
         }

diff --git a/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/ProgressIndicatorActivity.kt b/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/ProgressIndicatorActivity.kt
index 1c8461d..f7e5928 100644
--- a/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/ProgressIndicatorActivity.kt
+++ b/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/ProgressIndicatorActivity.kt

@@ -24,7 +24,7 @@
 import androidx.compose.unaryPlus
 import androidx.ui.graphics.Color
 import androidx.ui.layout.Arrangement
-import androidx.ui.layout.ExpandedWidth
+import androidx.ui.layout.LayoutExpandedWidth
 import androidx.ui.layout.FlexColumn
 import androidx.ui.layout.MainAxisAlignment
 import androidx.ui.layout.Row
@@ -87,12 +87,12 @@
 
     FlexColumn(mainAxisAlignment = MainAxisAlignment.Center) {
         expanded(flex = 1f) {
-            Row(ExpandedWidth, arrangement = Arrangement.SpaceEvenly) {
+            Row(LayoutExpandedWidth, arrangement = Arrangement.SpaceEvenly) {
                 // Determinate indicators
                 LinearProgressIndicator(progress = state.progress)
                 CircularProgressIndicator(progress = state.progress)
             }
-            Row(ExpandedWidth, arrangement = Arrangement.SpaceEvenly) {
+            Row(LayoutExpandedWidth, arrangement = Arrangement.SpaceEvenly) {
                 // Fancy colours!
                 LinearProgressIndicator(progress = (state.progress), color = state.generateColor())
                 CircularProgressIndicator(
@@ -100,7 +100,7 @@
                     color = state.generateColor()
                 )
             }
-            Row(ExpandedWidth, arrangement = Arrangement.SpaceEvenly) {
+            Row(LayoutExpandedWidth, arrangement = Arrangement.SpaceEvenly) {
                 // Indeterminate indicators
                 LinearProgressIndicator()
                 CircularProgressIndicator()

diff --git a/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/SnackbarActivity.kt b/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/SnackbarActivity.kt
index e800d8f..b550f41 100644
--- a/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/SnackbarActivity.kt
+++ b/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/SnackbarActivity.kt

@@ -20,15 +20,15 @@
 import androidx.ui.core.Text
 import androidx.ui.core.dp
 import androidx.ui.layout.Column
-import androidx.ui.layout.Spacing
+import androidx.ui.layout.LayoutPadding
 import androidx.ui.material.samples.SimpleSnackbar
 import androidx.ui.material.samples.SlotsSnackbar
 
 class SnackbarActivity : MaterialDemoActivity() {
     @Composable
     override fun materialContent() {
-        Column(Spacing(left = 12.dp, right = 12.dp)) {
-            val textSpacing = Spacing(top = 12.dp, bottom = 12.dp)
+        Column(LayoutPadding(left = 12.dp, right = 12.dp)) {
+            val textSpacing = LayoutPadding(top = 12.dp, bottom = 12.dp)
             Text("Default Snackbar", modifier = textSpacing)
             SimpleSnackbar()
             Text(

diff --git a/ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/RallyActivity.kt b/ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/RallyActivity.kt
index 9740c08..0baff99 100644
--- a/ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/RallyActivity.kt
+++ b/ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/RallyActivity.kt

@@ -25,9 +25,9 @@
 import androidx.ui.core.setContent
 import androidx.ui.foundation.VerticalScroller
 import androidx.ui.layout.Column
-import androidx.ui.layout.Height
+import androidx.ui.layout.LayoutHeight
+import androidx.ui.layout.LayoutPadding
 import androidx.ui.layout.Spacer
-import androidx.ui.layout.Spacing
 import androidx.ui.material.Tab
 import androidx.ui.material.TabRow
 import androidx.ui.material.studies.Scaffold
@@ -65,11 +65,11 @@
 @Composable
 fun RallyBody() {
     VerticalScroller {
-        Column(modifier = Spacing(16.dp)) {
+        Column(modifier = LayoutPadding(16.dp)) {
             RallyAlertCard()
-            Spacer(Height(10.dp))
+            Spacer(LayoutHeight(10.dp))
             RallyAccountsOverviewCard()
-            Spacer(Height(10.dp))
+            Spacer(LayoutHeight(10.dp))
             RallyBillsOverviewCard()
         }
     }

diff --git a/ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/RallyAlertDialog.kt b/ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/RallyAlertDialog.kt
index cb1c976..249f41a 100644
--- a/ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/RallyAlertDialog.kt
+++ b/ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/RallyAlertDialog.kt

@@ -23,8 +23,8 @@
 import androidx.ui.foundation.shape.RectangleShape
 import androidx.ui.layout.Column
 import androidx.ui.layout.EdgeInsets
-import androidx.ui.layout.ExpandedWidth
-import androidx.ui.layout.Spacing
+import androidx.ui.layout.LayoutExpandedWidth
+import androidx.ui.layout.LayoutPadding
 import androidx.ui.material.AlertDialog
 import androidx.ui.material.Button
 import androidx.ui.material.Divider
@@ -45,14 +45,14 @@
                 val style = TextButtonStyle(RectangleShape).copy(paddings = EdgeInsets(16.dp))
                 Column {
                     Divider(
-                        Spacing(left = 12.dp, right = 12.dp),
+                        LayoutPadding(left = 12.dp, right = 12.dp),
                         color = (+MaterialTheme.colors()).onSurface.copy(alpha = 0.2f)
                     )
                     Button(
                         text = buttonText,
                         >
                         style = style,
-                        modifier = ExpandedWidth
+                        modifier = LayoutExpandedWidth
                     )
                 }
             }

diff --git a/ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/RallyCards.kt b/ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/RallyCards.kt
index bfa7156..9ba9924 100644
--- a/ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/RallyCards.kt
+++ b/ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/RallyCards.kt

@@ -28,16 +28,16 @@
 import androidx.ui.layout.Arrangement
 import androidx.ui.layout.Column
 import androidx.ui.layout.Container
-import androidx.ui.layout.ExpandedWidth
-import androidx.ui.layout.Size
-import androidx.ui.layout.Spacer
 import androidx.ui.layout.FlexRow
-import androidx.ui.layout.Gravity
-import androidx.ui.layout.Height
+import androidx.ui.layout.LayoutExpandedWidth
+import androidx.ui.layout.LayoutGravity
+import androidx.ui.layout.LayoutHeight
+import androidx.ui.layout.LayoutPadding
+import androidx.ui.layout.LayoutSize
+import androidx.ui.layout.LayoutWidth
 import androidx.ui.layout.Row
-import androidx.ui.layout.Spacing
+import androidx.ui.layout.Spacer
 import androidx.ui.layout.Stack
-import androidx.ui.layout.Width
 import androidx.ui.material.Button
 import androidx.ui.material.Divider
 import androidx.ui.material.MaterialTheme
@@ -69,7 +69,7 @@
                 Clickable( openDialog.value = true }) {
                     Container {
                         Row(
-                            modifier = Spacing(12.dp) wraps ExpandedWidth,
+                            modifier = LayoutPadding(12.dp) wraps LayoutExpandedWidth,
                             arrangement = Arrangement.SpaceBetween
                         ) {
                             Text(text = "Alerts", style = (+MaterialTheme.typography()).subtitle2)
@@ -79,17 +79,17 @@
                 }
             }
             Divider(
-                Spacing(left = 12.dp, right = 12.dp),
+                LayoutPadding(left = 12.dp, right = 12.dp),
                 color = (+MaterialTheme.colors()).background,
                 height = 2.dp
             )
             Ripple(bounded = true) {
                 Clickable( openDialog.value = true }) {
                     Container {
-                        Row(Spacing(12.dp)) {
+                        Row(LayoutPadding(12.dp)) {
                             Text(
                                 style = (+MaterialTheme.typography()).body1,
-                                modifier = Flexible(1f),
+                                modifier = LayoutFlexible(1f),
                                 text = alertMessage
                             )
                             // TODO: icons still don't work
@@ -111,12 +111,12 @@
 fun RallyAccountsOverviewCard() {
     Card {
         Column {
-            Column(modifier = Spacing(12.dp)) {
+            Column(modifier = LayoutPadding(12.dp)) {
                 Text(text = "Accounts", style = (+MaterialTheme.typography()).body1)
                 Text(text = "$12,132.49", style = (+MaterialTheme.typography()).h3)
             }
             Divider(color = rallyGreen, height = 1.dp)
-            Column(modifier = Spacing(12.dp)) {
+            Column(modifier = LayoutPadding(12.dp)) {
                 RallyAccountRow(
                     name = "Checking",
                     number = "1234",
@@ -151,29 +151,29 @@
 fun RallyAccountsCard() {
     VerticalScroller {
         Column {
-                Stack(Spacing(16.dp)) {
+                Stack(LayoutPadding(16.dp)) {
                         val accountsProportion = listOf(0.595f, 0.045f, 0.095f, 0.195f, 0.045f)
                         val colors = listOf(0xFF1EB980, 0xFF005D57, 0xFF04B97F, 0xFF37EFBA,
                             0xFFFAFFBF).map { Color(it) }
-                        Container(modifier = Gravity.Center, height = 300.dp, expanded = true) {
+                        Container(LayoutGravity.Center, height = 300.dp, expanded = true) {
                             DrawAnimatedCircle(accountsProportion, colors)
                         }
-                        Column(modifier = Gravity.Center) {
+                        Column(modifier = LayoutGravity.Center) {
                             Text(
                                 text = "Total",
                                 style = (+MaterialTheme.typography()).body1,
-                                modifier = Gravity.Center
+                                modifier = LayoutGravity.Center
                             )
                             Text(
                                 text = "$12,132.49",
                                 style = (+MaterialTheme.typography()).h3,
-                                modifier = Gravity.Center
+                                modifier = LayoutGravity.Center
                             )
                         }
                     }
-                Spacer(Height(10.dp))
+                Spacer(LayoutHeight(10.dp))
                 Card {
-                    Column(modifier = Spacing(12.dp)) {
+                    Column(modifier = LayoutPadding(12.dp)) {
                         RallyAccountRow(
                             name = "Checking",
                             number = "1234",
@@ -212,17 +212,17 @@
  */
 @Composable
 fun RallyAccountRow(name: String, number: String, amount: String, color: Color) {
-    FlexRow(Spacing(top = 12.dp, bottom = 12.dp)) {
+    FlexRow(LayoutPadding(top = 12.dp, bottom = 12.dp)) {
         inflexible {
             AccountIndicator(color = color)
-            Spacer(Width(8.dp))
+            Spacer(LayoutWidth(8.dp))
             Column {
                 Text(text = name, style = (+MaterialTheme.typography()).body1)
                 Text(text = "•••••$number", style = (+MaterialTheme.typography()).subtitle1)
             }
         }
         expanded(flex = 1.0f) {
-            Spacer(Size(width = 0.dp, height = 0.dp))
+            Spacer(LayoutSize(width = 0.dp, height = 0.dp))
         }
         inflexible {
             Text(text = "$ $amount", style = (+MaterialTheme.typography()).h6)
@@ -245,13 +245,13 @@
 fun RallyBillsOverviewCard() {
     Card {
         Column {
-            Column(modifier = Spacing(12.dp)) {
+            Column(modifier = LayoutPadding(12.dp)) {
                 Text(text = "Bills", style = (+MaterialTheme.typography()).subtitle2)
                 Text(text = "$1,810.00", style = (+MaterialTheme.typography()).h3)
             }
             Divider(color = rallyGreen, height = 1.dp)
             // TODO: change to proper bill items
-            Column(modifier = Spacing(12.dp)) {
+            Column(modifier = LayoutPadding(12.dp)) {
                 RallyAccountRow(
                     name = "RedPay Credit",
                     number = "Jan 29",
@@ -286,31 +286,31 @@
 fun RallyBillsCard() {
     VerticalScroller {
         Column {
-            Stack(Spacing(16.dp)) {
+            Stack(LayoutPadding(16.dp)) {
                 val accountsProportion = listOf(0.65f, 0.25f, 0.03f, 0.05f)
                 val colors = listOf(0xFF1EB980, 0xFF005D57, 0xFF04B97F, 0xFF37EFBA).map {
                     Color(it)
                 }
-                Container(modifier = Gravity.Center, height = 300.dp, expanded = true) {
+                Container(modifier = LayoutGravity.Center, height = 300.dp, expanded = true) {
                     DrawAnimatedCircle(accountsProportion, colors)
                 }
-                Column(modifier = Gravity.Center) {
+                Column(modifier = LayoutGravity.Center) {
                     Text(
                         text = "Due",
                         style = (+MaterialTheme.typography()).body1,
-                        modifier = Gravity.Center
+                        modifier = LayoutGravity.Center
                     )
                     Text(
                         text = "$1,810.00",
                         style = (+MaterialTheme.typography()).h3,
-                        modifier = Gravity.Center
+                        modifier = LayoutGravity.Center
                     )
                 }
             }
-            Spacer(Height(10.dp))
+            Spacer(LayoutHeight(10.dp))
             Card {
                 // TODO: change to proper bill items
-                Column(modifier = Spacing(12.dp)) {
+                Column(modifier = LayoutPadding(12.dp)) {
                     RallyAccountRow(
                         name = "RedPay Credit",
                         number = "Jan 29",

diff --git a/ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/DrawerSamples.kt b/ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/DrawerSamples.kt
index 1f8ecd6..bb3d9be 100644
--- a/ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/DrawerSamples.kt
+++ b/ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/DrawerSamples.kt

@@ -27,9 +27,9 @@
 import androidx.ui.layout.Center
 import androidx.ui.layout.Column
 import androidx.ui.layout.Container
-import androidx.ui.layout.ExpandedHeight
-import androidx.ui.layout.ExpandedWidth
-import androidx.ui.layout.Height
+import androidx.ui.layout.LayoutExpandedHeight
+import androidx.ui.layout.LayoutExpandedWidth
+import androidx.ui.layout.LayoutHeight
 import androidx.ui.layout.Spacer
 import androidx.ui.layout.Row
 import androidx.ui.material.BottomDrawerLayout
@@ -41,7 +41,7 @@
 @Sampled
 @Composable
 fun StaticDrawerSample() {
-    Row(ExpandedWidth) {
+    Row(LayoutExpandedWidth) {
         StaticDrawer {
             Center {
                 Text("Drawer Content")
@@ -83,9 +83,9 @@
 @Composable
 private fun YourDrawerContent(onStateChange: (DrawerState) -> Unit) {
     Container(expanded = true) {
-        Column(ExpandedHeight) {
+        Column(LayoutExpandedHeight) {
             Text(text = "Drawer Content")
-            Spacer(Height(20.dp))
+            Spacer(LayoutHeight(20.dp))
             Button(
                 text = "Close Drawer",
                  onStateChange(DrawerState.Closed) })
@@ -96,9 +96,9 @@
 @Composable
 private fun YourAppContent(text: String, onDrawerStateChange: (DrawerState) -> Unit) {
     Center {
-        Column(ExpandedHeight) {
+        Column(LayoutExpandedHeight) {
             Text(text = text)
-            Spacer(Height(20.dp))
+            Spacer(LayoutHeight(20.dp))
             Button(
                 text = "Click to open",
                  onDrawerStateChange(DrawerState.Opened) }

diff --git a/ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/TabSamples.kt b/ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/TabSamples.kt
index ef10226..ef95fd8 100644
--- a/ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/TabSamples.kt
+++ b/ui/ui-material/integration-tests/samples/src/main/java/androidx/ui/material/samples/TabSamples.kt

@@ -46,8 +46,8 @@
 import androidx.ui.material.Tab
 import androidx.ui.material.TabRow
 import androidx.ui.graphics.Image
-import androidx.ui.layout.ExpandedHeight
-import androidx.ui.layout.Gravity
+import androidx.ui.layout.LayoutExpandedHeight
+import androidx.ui.layout.LayoutGravity
 import androidx.ui.material.MaterialTheme
 
 @Sampled
@@ -289,14 +289,15 @@
 fun FancyTab(title: String, onClick: () -> Unit, selected: Boolean) {
     MutuallyExclusiveSetItem(selected = selected,  {
         Container(height = 50.dp, padding = EdgeInsets(10.dp)) {
-            Column(ExpandedHeight) {
+            Column(LayoutExpandedHeight) {
                 val color = if (selected) Color.Red else Color.Gray
-                ColoredRect(height = 10.dp, width = 10.dp, color = color, modifier = Gravity.Center)
+                ColoredRect(height = 10.dp, width = 10.dp, color = color,
+                    modifier = LayoutGravity.Center)
                 Padding(5.dp) {
                     Text(
                         text = title,
                         style = (+MaterialTheme.typography()).body1,
-                        modifier = Gravity.Center
+                        modifier = LayoutGravity.Center
                     )
                 }
             }

diff --git a/ui/ui-material/src/main/java/androidx/ui/material/AlertDialog.kt b/ui/ui-material/src/main/java/androidx/ui/material/AlertDialog.kt
index 8cac77b..63eb9bc 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/AlertDialog.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/AlertDialog.kt

@@ -27,11 +27,11 @@
 import androidx.ui.layout.Column
 import androidx.ui.layout.Container
 import androidx.ui.layout.EdgeInsets
-import androidx.ui.layout.ExpandedWidth
-import androidx.ui.layout.Height
+import androidx.ui.layout.LayoutExpandedWidth
+import androidx.ui.layout.LayoutHeight
 import androidx.ui.layout.Spacer
 import androidx.ui.layout.Row
-import androidx.ui.layout.Width
+import androidx.ui.layout.LayoutWidth
 import androidx.ui.material.AlertDialogButtonLayout.SideBySide
 import androidx.ui.material.AlertDialogButtonLayout.Stacked
 import androidx.ui.material.surface.Surface
@@ -129,14 +129,14 @@
                         } else {
                             // TODO(b/138924683): Temporary until padding for the Text's
                             //  baseline
-                            Spacer(Height(NoTitleExtraHeight))
+                            Spacer(LayoutHeight(NoTitleExtraHeight))
                         }
 
                         Container(alignment = Alignment.CenterLeft, padding = TextPadding) {
                             val textStyle = (+MaterialTheme.typography()).body1
                             CurrentTextStyleProvider(textStyle, text)
                         }
-                        Spacer(Height(TextToButtonsHeight))
+                        Spacer(LayoutHeight(TextToButtonsHeight))
                         buttons()
                     }
                 }
@@ -163,12 +163,12 @@
     dismissButton: @Composable() (() -> Unit)?,
     buttonLayout: AlertDialogButtonLayout
 ) {
-    Container(ExpandedWidth, padding = ButtonsPadding, alignment = Alignment.CenterRight) {
+    Container(LayoutExpandedWidth, padding = ButtonsPadding, alignment = Alignment.CenterRight) {
         if (buttonLayout == AlertDialogButtonLayout.SideBySide) {
             Row(arrangement = Arrangement.End) {
                 if (dismissButton != null) {
                     dismissButton()
-                    Spacer(Width(ButtonsWidthSpace))
+                    Spacer(LayoutWidth(ButtonsWidthSpace))
                 }
 
                 confirmButton()
@@ -178,7 +178,7 @@
                 confirmButton()
 
                 if (dismissButton != null) {
-                    Spacer(Height(ButtonsHeightSpace))
+                    Spacer(LayoutHeight(ButtonsHeightSpace))
                     dismissButton()
                 }
             }

diff --git a/ui/ui-material/src/main/java/androidx/ui/material/AppBar.kt b/ui/ui-material/src/main/java/androidx/ui/material/AppBar.kt
index 2cefabf..e661377 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/AppBar.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/AppBar.kt

@@ -48,7 +48,7 @@
 import androidx.ui.layout.MainAxisAlignment
 import androidx.ui.layout.Row
 import androidx.ui.layout.Spacer
-import androidx.ui.layout.Width
+import androidx.ui.layout.LayoutWidth
 import androidx.ui.material.surface.Surface
 import androidx.ui.graphics.Color
 import androidx.ui.layout.EdgeInsets
@@ -63,8 +63,8 @@
 import androidx.ui.layout.Align
 import androidx.ui.layout.AlignmentLineOffset
 import androidx.ui.layout.Arrangement
-import androidx.ui.layout.Expanded
-import androidx.ui.layout.ExpandedHeight
+import androidx.ui.layout.LayoutExpanded
+import androidx.ui.layout.LayoutExpandedHeight
 import androidx.ui.layout.Padding
 import androidx.ui.text.TextStyle
 import kotlin.math.sqrt
@@ -158,7 +158,7 @@
             if (startContent != null) {
                 inflexible {
                     Container(
-                        modifier = ExpandedHeight,
+                        modifier = LayoutExpandedHeight,
                         width = AppBarTitleStartPadding,
                         alignment = Alignment.CenterLeft,
                         children = startContent
@@ -181,7 +181,7 @@
             if (endContent != null) {
                 inflexible {
                     Container(
-                        modifier = ExpandedHeight,
+                        modifier = LayoutExpandedHeight,
                         alignment = Alignment.Center,
                         children = endContent
                     )
@@ -629,7 +629,7 @@
 ) {
     BaseAppBar(color, BottomAppBarElevation, shape) {
         Padding(top = AppBarPadding, bottom = AppBarPadding) {
-            Row(Expanded, arrangement = Arrangement.SpaceBetween) {
+            Row(LayoutExpanded, arrangement = Arrangement.SpaceBetween) {
                 // Using wrap so that even if startContent is null or emits no layout nodes,
                 // we will still force end content to be placed at the end of the row.
                 Wrap(alignment = Alignment.Center, children = startContent ?: {})
@@ -726,11 +726,11 @@
         shownActions.forEach { (index, shownAction) ->
             action(shownAction)
             if (index != shownActions.lastIndex) {
-                Spacer(Width(24.dp))
+                Spacer(LayoutWidth(24.dp))
             }
         }
         if (overflowActions.isNotEmpty()) {
-            Spacer(Width(24.dp))
+            Spacer(LayoutWidth(24.dp))
             // TODO: use overflowActions to build menu here
             Container(width = 12.dp) {
                 Text(text = "${overflowActions.size}", style = TextStyle(fontSize = 15.sp))

diff --git a/ui/ui-material/src/main/java/androidx/ui/material/DataTable.kt b/ui/ui-material/src/main/java/androidx/ui/material/DataTable.kt
index 6e45c65..415c7df 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/DataTable.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/DataTable.kt

@@ -40,13 +40,13 @@
 import androidx.ui.layout.Column
 import androidx.ui.layout.Container
 import androidx.ui.layout.EdgeInsets
-import androidx.ui.layout.Expanded
-import androidx.ui.layout.Gravity
+import androidx.ui.layout.LayoutExpanded
+import androidx.ui.layout.LayoutGravity
 import androidx.ui.layout.Row
 import androidx.ui.layout.Table
 import androidx.ui.layout.TableColumnWidth
 import androidx.ui.layout.Spacer
-import androidx.ui.layout.Width
+import androidx.ui.layout.LayoutWidth
 import androidx.ui.material.ripple.Ripple
 import androidx.ui.text.TextStyle
 import androidx.ui.text.font.FontWeight
@@ -212,7 +212,7 @@
             } else {
                 Row {
                     SimpleImage(image = image)
-                    Spacer(Width(2.dp))
+                    Spacer(LayoutWidth(2.dp))
                     Text(text = text(j))
                 }
             }
@@ -257,7 +257,7 @@
             } else {
                 Row {
                     SimpleImage(image = image)
-                    Spacer(Width(2.dp))
+                    Spacer(LayoutWidth(2.dp))
                     Text(text = text(j))
                 }
             }
@@ -395,7 +395,7 @@
                                     headerDecoration = {
                                         // TODO(calintat): Replace with animated arrow icons.
                                         Text(text = if (sorting.ascending) "↑" else "↓")
-                                        Spacer(Width(2.dp))
+                                        Spacer(LayoutWidth(2.dp))
                                     }
                                 } else {
                                     >
@@ -484,11 +484,11 @@
         Column {
             table()
             Container(height = dataRowHeight, padding = cellSpacing) {
-                Row(Expanded, arrangement = Arrangement.End) {
+                Row(LayoutExpanded, arrangement = Arrangement.End) {
                     val pages = (rows.size - 1) / pagination.rowsPerPage + 1
                     val startRow = pagination.rowsPerPage * pagination.page
                     val endRow = (startRow + pagination.rowsPerPage).coerceAtMost(rows.size)
-                    val modifier = Gravity.Center
+                    val modifier = LayoutGravity.Center
 
                     // TODO(calintat): Replace this with a dropdown menu whose items are taken
                     //  from availableRowsPerPage (filtered to those that are in the range
@@ -496,11 +496,11 @@
                     //  onRowsPerPageChange with the appropriate value.
                     Text(text = "Rows per page: ${pagination.rowsPerPage}", modifier = modifier)
 
-                    Spacer(Width(32.dp))
+                    Spacer(LayoutWidth(32.dp))
 
                     Text(text = "${startRow + 1}-$endRow of ${rows.size}", modifier = modifier)
 
-                    Spacer(Width(32.dp))
+                    Spacer(LayoutWidth(32.dp))
 
                     // TODO(calintat): Replace this with an image button with chevron_left icon.
                     Container(modifier = modifier) {
@@ -515,7 +515,7 @@
                         }
                     }
 
-                    Spacer(Width(24.dp))
+                    Spacer(LayoutWidth(24.dp))
 
                     // TODO(calintat): Replace this with an image button with chevron_right icon.
                     Container(modifier = modifier) {

diff --git a/ui/ui-material/src/main/java/androidx/ui/material/Divider.kt b/ui/ui-material/src/main/java/androidx/ui/material/Divider.kt
index 1534067..409f760 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/Divider.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/Divider.kt

@@ -23,7 +23,7 @@
 import androidx.ui.core.dp
 import androidx.ui.foundation.ColoredRect
 import androidx.ui.graphics.Color
-import androidx.ui.layout.Spacing
+import androidx.ui.layout.LayoutPadding
 
 /**
  * A divider is a thin line that groups content in lists and layouts
@@ -39,6 +39,6 @@
     height: Dp = 1.dp,
     indent: Dp = 0.dp
 ) {
-    val indentMod = if (indent.value != 0f) Spacing(left = indent) else Modifier.None
+    val indentMod = if (indent.value != 0f) LayoutPadding(left = indent) else Modifier.None
     ColoredRect(color, modifier wraps indentMod, height = height)
 }
\ No newline at end of file

diff --git a/ui/ui-material/src/main/java/androidx/ui/material/FloatingActionButton.kt b/ui/ui-material/src/main/java/androidx/ui/material/FloatingActionButton.kt
index 4ea4cc3..514bfee 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/FloatingActionButton.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/FloatingActionButton.kt

@@ -33,7 +33,7 @@
 import androidx.ui.layout.Padding
 import androidx.ui.layout.Row
 import androidx.ui.layout.Spacer
-import androidx.ui.layout.Width
+import androidx.ui.layout.LayoutWidth
 import androidx.ui.graphics.Image
 import androidx.ui.material.ripple.Ripple
 import androidx.ui.material.surface.Surface
@@ -157,7 +157,7 @@
             Padding(left = ExtendedFabIconPadding, right = ExtendedFabTextPadding) {
                 Row {
                     SimpleImage(image = icon)
-                    Spacer(Width(ExtendedFabIconPadding))
+                    Spacer(LayoutWidth(ExtendedFabIconPadding))
                     Text(text = text, style = textStyle)
                 }
             }

diff --git a/ui/ui-material/src/main/java/androidx/ui/material/RadioButton.kt b/ui/ui-material/src/main/java/androidx/ui/material/RadioButton.kt
index 6bb6337..c496844 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/RadioButton.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/RadioButton.kt

@@ -45,7 +45,7 @@
 import androidx.ui.graphics.Canvas
 import androidx.ui.graphics.Paint
 import androidx.ui.graphics.PaintingStyle
-import androidx.ui.layout.ExpandedWidth
+import androidx.ui.layout.LayoutExpandedWidth
 import androidx.ui.text.TextStyle
 
 /**
@@ -160,7 +160,7 @@
     ) {
         RadioGroupItem(selected = selected,  {
             Padding(padding = DefaultRadioItemPadding) {
-                Row(ExpandedWidth) {
+                Row(LayoutExpandedWidth) {
                     RadioButton(selected = selected,  color = radioColor)
                     Padding(left = DefaultRadioLabelOffset) {
                         Text(

diff --git a/ui/ui-material/src/main/java/androidx/ui/material/Slider.kt b/ui/ui-material/src/main/java/androidx/ui/material/Slider.kt
index 928585a..6103841 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/Slider.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/Slider.kt

@@ -50,7 +50,7 @@
 import androidx.ui.layout.Container
 import androidx.ui.layout.DpConstraints
 import androidx.ui.layout.Padding
-import androidx.ui.layout.Size
+import androidx.ui.layout.LayoutSize
 import androidx.ui.layout.Spacer
 import androidx.ui.lerp
 import androidx.ui.material.ripple.Ripple
@@ -223,7 +223,7 @@
                         color = color,
                         elevation = if (pressed) 6.dp else 1.dp
                     ) {
-                        Spacer(Size(thumbSize, thumbSize))
+                        Spacer(LayoutSize(thumbSize, thumbSize))
                     }
                 }
             }

diff --git a/ui/ui-material/src/main/java/androidx/ui/material/Snackbar.kt b/ui/ui-material/src/main/java/androidx/ui/material/Snackbar.kt
index 09277b1..e147f8b 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/Snackbar.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/Snackbar.kt

@@ -35,9 +35,9 @@
 import androidx.ui.layout.AlignmentLineOffset
 import androidx.ui.layout.Column
 import androidx.ui.layout.Container
-import androidx.ui.layout.ExpandedWidth
-import androidx.ui.layout.Gravity
-import androidx.ui.layout.Spacing
+import androidx.ui.layout.LayoutExpandedWidth
+import androidx.ui.layout.LayoutGravity
+import androidx.ui.layout.LayoutPadding
 import androidx.ui.material.surface.Surface
 
 /**
@@ -145,7 +145,7 @@
 @Composable
 private fun TextOnlySnackbar(text: @Composable() () -> Unit) {
     Layout(
-        text, modifier = Spacing(left = HorizontalSpacing, right = HorizontalSpacing)
+        text, modifier = LayoutPadding(left = HorizontalSpacing, right = HorizontalSpacing)
     ) { measurables, constraints ->
         require(measurables.size == 1) {
             "text for Snackbar expected to have exactly only one child"
@@ -168,7 +168,7 @@
     button: @Composable() () -> Unit
 ) {
     Column(
-        modifier = ExpandedWidth wraps Spacing(
+        modifier = LayoutExpandedWidth wraps LayoutPadding(
             left = HorizontalSpacing,
             right = HorizontalSpacingButtonSide,
             bottom = SeparateButtonExtraY
@@ -176,10 +176,10 @@
     ) {
         AlignmentLineOffset(alignmentLine = LastBaseline, after = LongButtonVerticalOffset) {
             AlignmentLineOffset(alignmentLine = FirstBaseline, before = HeightToFirstLine) {
-                Container(modifier = Spacing(right = HorizontalSpacingButtonSide), children = text)
+                Container(LayoutPadding(right = HorizontalSpacingButtonSide), children = text)
             }
         }
-        Container(modifier = Gravity.End, children = button)
+        Container(modifier = LayoutGravity.End, children = button)
     }
 }
 
@@ -190,7 +190,7 @@
 ) {
     Layout(
         text, button,
-        modifier = Spacing(left = HorizontalSpacing, right = HorizontalSpacingButtonSide)
+        modifier = LayoutPadding(left = HorizontalSpacing, right = HorizontalSpacingButtonSide)
     ) { measurables, constraints ->
         require(measurables[text].size == 1) {
             "text for Snackbar expected to have exactly only one child"

diff --git a/ui/ui-material/src/main/java/androidx/ui/material/Tab.kt b/ui/ui-material/src/main/java/androidx/ui/material/Tab.kt
index 302be91..815ea6e 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/Tab.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/Tab.kt

@@ -49,15 +49,16 @@
 import androidx.ui.foundation.SimpleImage
 import androidx.ui.foundation.selection.MutuallyExclusiveSetItem
 import androidx.ui.graphics.Color
+import androidx.ui.graphics.Image
 import androidx.ui.layout.Container
 import androidx.ui.layout.FlexRow
+import androidx.ui.layout.LayoutGravity
 import androidx.ui.layout.Padding
 import androidx.ui.layout.Stack
+import androidx.ui.material.TabRow.IndicatorTransition
 import androidx.ui.material.TabRow.TabPosition
 import androidx.ui.material.ripple.Ripple
 import androidx.ui.material.surface.Surface
-import androidx.ui.graphics.Image
-import androidx.ui.layout.Gravity
 import androidx.ui.text.style.TextAlign
 
 /**
@@ -169,11 +170,11 @@
     }
 
     Stack {
-        FlexRow(Gravity.Center) {
+        FlexRow(LayoutGravity.Center) {
             expanded(1f, tabs)
         }
-        divider(Gravity.BottomCenter)
-        Container(Gravity.Stretch) {
+        divider(LayoutGravity.BottomCenter)
+        Container(LayoutGravity.Stretch) {
             indicatorContainer(tabPositions)
         }
     }

diff --git a/ui/ui-text/integration-tests/text-demos/src/main/java/androidx/ui/text/demos/ComposeInputField.kt b/ui/ui-text/integration-tests/text-demos/src/main/java/androidx/ui/text/demos/ComposeInputField.kt
index 7d0f2b1..b182e9d 100644
--- a/ui/ui-text/integration-tests/text-demos/src/main/java/androidx/ui/text/demos/ComposeInputField.kt
+++ b/ui/ui-text/integration-tests/text-demos/src/main/java/androidx/ui/text/demos/ComposeInputField.kt

@@ -24,7 +24,7 @@
 import androidx.ui.input.KeyboardType
 import androidx.ui.layout.Column
 import androidx.ui.foundation.VerticalScroller
-import androidx.ui.layout.ExpandedHeight
+import androidx.ui.layout.LayoutExpandedHeight
 import androidx.ui.text.TextStyle
 
 val KEYBOARD_TYPES = listOf(
@@ -51,7 +51,7 @@
 @Composable
 fun InputFieldDemo() {
     VerticalScroller {
-        Column(ExpandedHeight) {
+        Column(LayoutExpandedHeight) {
             TagLine(tag = "simple editing")
             EditLine()
             TagLine(tag = "simple editing2")

diff --git a/ui/ui-text/integration-tests/text-demos/src/main/java/androidx/ui/text/demos/ComposeText.kt b/ui/ui-text/integration-tests/text-demos/src/main/java/androidx/ui/text/demos/ComposeText.kt
index 23186ec..12e03eeb 100644
--- a/ui/ui-text/integration-tests/text-demos/src/main/java/androidx/ui/text/demos/ComposeText.kt
+++ b/ui/ui-text/integration-tests/text-demos/src/main/java/androidx/ui/text/demos/ComposeText.kt

@@ -35,8 +35,8 @@
 import androidx.ui.text.style.TextOverflow
 import androidx.ui.core.em
 import androidx.ui.core.sp
-import androidx.ui.layout.ExpandedHeight
-import androidx.ui.layout.ExpandedWidth
+import androidx.ui.layout.LayoutExpandedHeight
+import androidx.ui.layout.LayoutExpandedWidth
 import androidx.ui.text.LocaleList
 import androidx.ui.text.SpanStyle
 import androidx.ui.text.samples.BaselineShiftSample
@@ -278,7 +278,7 @@
 @Composable
 fun TextDemoHeight() {
     // This group of text composables show different height.
-    Row(ExpandedWidth) {
+    Row(LayoutExpandedWidth) {
         Text {
             Span(
                 text = "$displayText\n$displayText   ",
@@ -365,7 +365,7 @@
     for (i in 1..10) {
         text = "$text$displayText "
     }
-    Column(ExpandedHeight) {
+    Column(LayoutExpandedHeight) {
         SecondTagLine(tag = "textAlign = TextAlign.Left")
         Text(style = TextStyle(textAlign = TextAlign.Left)) {
             Span(text = displayText, style = SpanStyle(fontSize = fontSize8))
@@ -425,7 +425,7 @@
     }
     val spanStyle = SpanStyle(fontSize = fontSize8, color = Color(0xFFFF0000))
 
-    Column(ExpandedHeight) {
+    Column(LayoutExpandedHeight) {
         Text {
             Span(text = text, style = spanStyle)
         }

diff --git a/ui/ui-text/integration-tests/text-demos/src/main/java/androidx/ui/text/demos/ComposeTextSelection.kt b/ui/ui-text/integration-tests/text-demos/src/main/java/androidx/ui/text/demos/ComposeTextSelection.kt
index 344e439..6a5aa5e 100644
--- a/ui/ui-text/integration-tests/text-demos/src/main/java/androidx/ui/text/demos/ComposeTextSelection.kt
+++ b/ui/ui-text/integration-tests/text-demos/src/main/java/androidx/ui/text/demos/ComposeTextSelection.kt

@@ -26,8 +26,8 @@
 import androidx.ui.foundation.VerticalScroller
 import androidx.ui.graphics.Color
 import androidx.ui.layout.Column
-import androidx.ui.layout.ExpandedHeight
-import androidx.ui.layout.ExpandedWidth
+import androidx.ui.layout.LayoutExpandedHeight
+import androidx.ui.layout.LayoutExpandedWidth
 import androidx.ui.layout.Row
 import androidx.ui.text.LocaleList
 import androidx.ui.text.SpanStyle
@@ -133,9 +133,9 @@
     SelectionContainer(
         selection = selection.value,
          selection.value = it }) {
-        Column(ExpandedHeight) {
+        Column(LayoutExpandedHeight) {
             for (i in 0..2) {
-                Row(ExpandedWidth) {
+                Row(LayoutExpandedWidth) {
                     for (j in 0..2) {
                         Text {
                             Span(
commit	712dc996d5f5d278fb791599cda8d1c4b74c67f5	[log] [tgz]
author	Adam Powell <adamp@google.com>	Wed Dec 04 12:48:30 2019 -0800
committer	Adam Powell <adamp@google.com>	Fri Dec 06 10:48:09 2019 -0800
tree	aeff2436f3960d53b47de7409f568079aa2ece3a
parent	0c66cf8453af80b9268e91114760134c7cb8aed6 [diff]