diff --git a/components/style/properties/longhand/background.mako.rs b/components/style/properties/longhands/background.mako.rs
similarity index 100%
rename from components/style/properties/longhand/background.mako.rs
rename to components/style/properties/longhands/background.mako.rs
diff --git a/components/style/properties/longhand/border.mako.rs b/components/style/properties/longhands/border.mako.rs
similarity index 100%
rename from components/style/properties/longhand/border.mako.rs
rename to components/style/properties/longhands/border.mako.rs
diff --git a/components/style/properties/longhand/box.mako.rs b/components/style/properties/longhands/box.mako.rs
similarity index 100%
rename from components/style/properties/longhand/box.mako.rs
rename to components/style/properties/longhands/box.mako.rs
diff --git a/components/style/properties/longhand/color.mako.rs b/components/style/properties/longhands/color.mako.rs
similarity index 100%
rename from components/style/properties/longhand/color.mako.rs
rename to components/style/properties/longhands/color.mako.rs
diff --git a/components/style/properties/longhand/column.mako.rs b/components/style/properties/longhands/column.mako.rs
similarity index 100%
rename from components/style/properties/longhand/column.mako.rs
rename to components/style/properties/longhands/column.mako.rs
diff --git a/components/style/properties/longhand/counters.mako.rs b/components/style/properties/longhands/counters.mako.rs
similarity index 100%
rename from components/style/properties/longhand/counters.mako.rs
rename to components/style/properties/longhands/counters.mako.rs
diff --git a/components/style/properties/longhand/effects.mako.rs b/components/style/properties/longhands/effects.mako.rs
similarity index 100%
rename from components/style/properties/longhand/effects.mako.rs
rename to components/style/properties/longhands/effects.mako.rs
diff --git a/components/style/properties/longhand/font.mako.rs b/components/style/properties/longhands/font.mako.rs
similarity index 100%
rename from components/style/properties/longhand/font.mako.rs
rename to components/style/properties/longhands/font.mako.rs
diff --git a/components/style/properties/longhand/inherited_box.mako.rs b/components/style/properties/longhands/inherited_box.mako.rs
similarity index 100%
rename from components/style/properties/longhand/inherited_box.mako.rs
rename to components/style/properties/longhands/inherited_box.mako.rs
diff --git a/components/style/properties/longhand/inherited_svg.mako.rs b/components/style/properties/longhands/inherited_svg.mako.rs
similarity index 100%
rename from components/style/properties/longhand/inherited_svg.mako.rs
rename to components/style/properties/longhands/inherited_svg.mako.rs
diff --git a/components/style/properties/longhand/inherited_table.mako.rs b/components/style/properties/longhands/inherited_table.mako.rs
similarity index 100%
rename from components/style/properties/longhand/inherited_table.mako.rs
rename to components/style/properties/longhands/inherited_table.mako.rs
diff --git a/components/style/properties/longhand/inherited_text.mako.rs b/components/style/properties/longhands/inherited_text.mako.rs
similarity index 100%
rename from components/style/properties/longhand/inherited_text.mako.rs
rename to components/style/properties/longhands/inherited_text.mako.rs
diff --git a/components/style/properties/longhand/inherited_ui.mako.rs b/components/style/properties/longhands/inherited_ui.mako.rs
similarity index 100%
rename from components/style/properties/longhand/inherited_ui.mako.rs
rename to components/style/properties/longhands/inherited_ui.mako.rs
diff --git a/components/style/properties/longhand/list.mako.rs b/components/style/properties/longhands/list.mako.rs
similarity index 100%
rename from components/style/properties/longhand/list.mako.rs
rename to components/style/properties/longhands/list.mako.rs
diff --git a/components/style/properties/longhand/margin.mako.rs b/components/style/properties/longhands/margin.mako.rs
similarity index 100%
rename from components/style/properties/longhand/margin.mako.rs
rename to components/style/properties/longhands/margin.mako.rs
diff --git a/components/style/properties/longhand/outline.mako.rs b/components/style/properties/longhands/outline.mako.rs
similarity index 100%
rename from components/style/properties/longhand/outline.mako.rs
rename to components/style/properties/longhands/outline.mako.rs
diff --git a/components/style/properties/longhand/padding.mako.rs b/components/style/properties/longhands/padding.mako.rs
similarity index 100%
rename from components/style/properties/longhand/padding.mako.rs
rename to components/style/properties/longhands/padding.mako.rs
diff --git a/components/style/properties/longhand/position.mako.rs b/components/style/properties/longhands/position.mako.rs
similarity index 100%
rename from components/style/properties/longhand/position.mako.rs
rename to components/style/properties/longhands/position.mako.rs
diff --git a/components/style/properties/longhand/svg.mako.rs b/components/style/properties/longhands/svg.mako.rs
similarity index 100%
rename from components/style/properties/longhand/svg.mako.rs
rename to components/style/properties/longhands/svg.mako.rs
diff --git a/components/style/properties/longhand/table.mako.rs b/components/style/properties/longhands/table.mako.rs
similarity index 100%
rename from components/style/properties/longhand/table.mako.rs
rename to components/style/properties/longhands/table.mako.rs
diff --git a/components/style/properties/longhand/text.mako.rs b/components/style/properties/longhands/text.mako.rs
similarity index 100%
rename from components/style/properties/longhand/text.mako.rs
rename to components/style/properties/longhands/text.mako.rs
diff --git a/components/style/properties/longhand/ui.mako.rs b/components/style/properties/longhands/ui.mako.rs
similarity index 100%
rename from components/style/properties/longhand/ui.mako.rs
rename to components/style/properties/longhands/ui.mako.rs
diff --git a/components/style/properties/longhand/xul.mako.rs b/components/style/properties/longhands/xul.mako.rs
similarity index 100%
rename from components/style/properties/longhand/xul.mako.rs
rename to components/style/properties/longhands/xul.mako.rs
diff --git a/components/style/properties/properties.mako.rs b/components/style/properties/properties.mako.rs
index e74fc888e4e..a3d4787ab72 100644
--- a/components/style/properties/properties.mako.rs
+++ b/components/style/properties/properties.mako.rs
@@ -97,29 +97,29 @@ macro_rules! expanded {
 /// A module with all the code for longhand properties.
 #[allow(missing_docs)]
 pub mod longhands {
-    <%include file="/longhand/background.mako.rs" />
-    <%include file="/longhand/border.mako.rs" />
-    <%include file="/longhand/box.mako.rs" />
-    <%include file="/longhand/color.mako.rs" />
-    <%include file="/longhand/column.mako.rs" />
-    <%include file="/longhand/counters.mako.rs" />
-    <%include file="/longhand/effects.mako.rs" />
-    <%include file="/longhand/font.mako.rs" />
-    <%include file="/longhand/inherited_box.mako.rs" />
-    <%include file="/longhand/inherited_table.mako.rs" />
-    <%include file="/longhand/inherited_text.mako.rs" />
-    <%include file="/longhand/inherited_ui.mako.rs" />
-    <%include file="/longhand/list.mako.rs" />
-    <%include file="/longhand/margin.mako.rs" />
-    <%include file="/longhand/outline.mako.rs" />
-    <%include file="/longhand/padding.mako.rs" />
-    <%include file="/longhand/position.mako.rs" />
-    <%include file="/longhand/table.mako.rs" />
-    <%include file="/longhand/text.mako.rs" />
-    <%include file="/longhand/ui.mako.rs" />
-    <%include file="/longhand/inherited_svg.mako.rs" />
-    <%include file="/longhand/svg.mako.rs" />
-    <%include file="/longhand/xul.mako.rs" />
+    <%include file="/longhands/background.mako.rs" />
+    <%include file="/longhands/border.mako.rs" />
+    <%include file="/longhands/box.mako.rs" />
+    <%include file="/longhands/color.mako.rs" />
+    <%include file="/longhands/column.mako.rs" />
+    <%include file="/longhands/counters.mako.rs" />
+    <%include file="/longhands/effects.mako.rs" />
+    <%include file="/longhands/font.mako.rs" />
+    <%include file="/longhands/inherited_box.mako.rs" />
+    <%include file="/longhands/inherited_table.mako.rs" />
+    <%include file="/longhands/inherited_text.mako.rs" />
+    <%include file="/longhands/inherited_ui.mako.rs" />
+    <%include file="/longhands/list.mako.rs" />
+    <%include file="/longhands/margin.mako.rs" />
+    <%include file="/longhands/outline.mako.rs" />
+    <%include file="/longhands/padding.mako.rs" />
+    <%include file="/longhands/position.mako.rs" />
+    <%include file="/longhands/table.mako.rs" />
+    <%include file="/longhands/text.mako.rs" />
+    <%include file="/longhands/ui.mako.rs" />
+    <%include file="/longhands/inherited_svg.mako.rs" />
+    <%include file="/longhands/svg.mako.rs" />
+    <%include file="/longhands/xul.mako.rs" />
 }
 
 macro_rules! unwrap_or_initial {
@@ -163,20 +163,20 @@ pub mod shorthands {
         Ok(())
     }
 
-    <%include file="/shorthand/background.mako.rs" />
-    <%include file="/shorthand/border.mako.rs" />
-    <%include file="/shorthand/box.mako.rs" />
-    <%include file="/shorthand/column.mako.rs" />
-    <%include file="/shorthand/font.mako.rs" />
-    <%include file="/shorthand/inherited_text.mako.rs" />
-    <%include file="/shorthand/list.mako.rs" />
-    <%include file="/shorthand/margin.mako.rs" />
-    <%include file="/shorthand/mask.mako.rs" />
-    <%include file="/shorthand/outline.mako.rs" />
-    <%include file="/shorthand/padding.mako.rs" />
-    <%include file="/shorthand/position.mako.rs" />
-    <%include file="/shorthand/inherited_svg.mako.rs" />
-    <%include file="/shorthand/text.mako.rs" />
+    <%include file="/shorthands/background.mako.rs" />
+    <%include file="/shorthands/border.mako.rs" />
+    <%include file="/shorthands/box.mako.rs" />
+    <%include file="/shorthands/column.mako.rs" />
+    <%include file="/shorthands/font.mako.rs" />
+    <%include file="/shorthands/inherited_text.mako.rs" />
+    <%include file="/shorthands/list.mako.rs" />
+    <%include file="/shorthands/margin.mako.rs" />
+    <%include file="/shorthands/mask.mako.rs" />
+    <%include file="/shorthands/outline.mako.rs" />
+    <%include file="/shorthands/padding.mako.rs" />
+    <%include file="/shorthands/position.mako.rs" />
+    <%include file="/shorthands/inherited_svg.mako.rs" />
+    <%include file="/shorthands/text.mako.rs" />
 
     // We don't defined the 'all' shorthand using the regular helpers:shorthand
     // mechanism, since it causes some very large types to be generated.
diff --git a/components/style/properties/shorthand/background.mako.rs b/components/style/properties/shorthands/background.mako.rs
similarity index 100%
rename from components/style/properties/shorthand/background.mako.rs
rename to components/style/properties/shorthands/background.mako.rs
diff --git a/components/style/properties/shorthand/border.mako.rs b/components/style/properties/shorthands/border.mako.rs
similarity index 100%
rename from components/style/properties/shorthand/border.mako.rs
rename to components/style/properties/shorthands/border.mako.rs
diff --git a/components/style/properties/shorthand/box.mako.rs b/components/style/properties/shorthands/box.mako.rs
similarity index 100%
rename from components/style/properties/shorthand/box.mako.rs
rename to components/style/properties/shorthands/box.mako.rs
diff --git a/components/style/properties/shorthand/column.mako.rs b/components/style/properties/shorthands/column.mako.rs
similarity index 100%
rename from components/style/properties/shorthand/column.mako.rs
rename to components/style/properties/shorthands/column.mako.rs
diff --git a/components/style/properties/shorthand/font.mako.rs b/components/style/properties/shorthands/font.mako.rs
similarity index 100%
rename from components/style/properties/shorthand/font.mako.rs
rename to components/style/properties/shorthands/font.mako.rs
diff --git a/components/style/properties/shorthand/inherited_svg.mako.rs b/components/style/properties/shorthands/inherited_svg.mako.rs
similarity index 100%
rename from components/style/properties/shorthand/inherited_svg.mako.rs
rename to components/style/properties/shorthands/inherited_svg.mako.rs
diff --git a/components/style/properties/shorthand/inherited_text.mako.rs b/components/style/properties/shorthands/inherited_text.mako.rs
similarity index 100%
rename from components/style/properties/shorthand/inherited_text.mako.rs
rename to components/style/properties/shorthands/inherited_text.mako.rs
diff --git a/components/style/properties/shorthand/list.mako.rs b/components/style/properties/shorthands/list.mako.rs
similarity index 100%
rename from components/style/properties/shorthand/list.mako.rs
rename to components/style/properties/shorthands/list.mako.rs
diff --git a/components/style/properties/shorthand/margin.mako.rs b/components/style/properties/shorthands/margin.mako.rs
similarity index 100%
rename from components/style/properties/shorthand/margin.mako.rs
rename to components/style/properties/shorthands/margin.mako.rs
diff --git a/components/style/properties/shorthand/mask.mako.rs b/components/style/properties/shorthands/mask.mako.rs
similarity index 100%
rename from components/style/properties/shorthand/mask.mako.rs
rename to components/style/properties/shorthands/mask.mako.rs
diff --git a/components/style/properties/shorthand/outline.mako.rs b/components/style/properties/shorthands/outline.mako.rs
similarity index 100%
rename from components/style/properties/shorthand/outline.mako.rs
rename to components/style/properties/shorthands/outline.mako.rs
diff --git a/components/style/properties/shorthand/padding.mako.rs b/components/style/properties/shorthands/padding.mako.rs
similarity index 100%
rename from components/style/properties/shorthand/padding.mako.rs
rename to components/style/properties/shorthands/padding.mako.rs
diff --git a/components/style/properties/shorthand/position.mako.rs b/components/style/properties/shorthands/position.mako.rs
similarity index 100%
rename from components/style/properties/shorthand/position.mako.rs
rename to components/style/properties/shorthands/position.mako.rs
diff --git a/components/style/properties/shorthand/text.mako.rs b/components/style/properties/shorthands/text.mako.rs
similarity index 100%
rename from components/style/properties/shorthand/text.mako.rs
rename to components/style/properties/shorthands/text.mako.rs