diff --git a/layout/generic/nsPageFrame.cpp b/layout/generic/nsPageFrame.cpp
index ae9af2042063..c04cffc8c18e 100644
--- a/layout/generic/nsPageFrame.cpp
+++ b/layout/generic/nsPageFrame.cpp
@@ -604,12 +604,13 @@ nsSize nsPageFrame::ComputePageSize() const {
   }
   if (pageSize.IsOrientation()) {
     // Ensure the correct orientation is applied.
-    if (pageSize.AsOrientation() == StylePageOrientation::Portrait) {
+    if (pageSize.AsOrientation() == StylePageSizeOrientation::Portrait) {
       if (size.width > size.height) {
         std::swap(size.width, size.height);
       }
     } else {
-      MOZ_ASSERT(pageSize.AsOrientation() == StylePageOrientation::Landscape);
+      MOZ_ASSERT(pageSize.AsOrientation() ==
+                 StylePageSizeOrientation::Landscape);
       if (size.width < size.height) {
         std::swap(size.width, size.height);
       }
diff --git a/layout/printing/nsPrintJob.cpp b/layout/printing/nsPrintJob.cpp
index bcdb06a0da9f..0d36ee6bcfda 100644
--- a/layout/printing/nsPrintJob.cpp
+++ b/layout/printing/nsPrintJob.cpp
@@ -1336,15 +1336,15 @@ nsresult nsPrintJob::ReflowPrintObject(const UniquePtr<nsPrintObject>& aPO) {
   // FinishPrintPreview, so that the frontend can reflect this.
   // The new document has not yet been reflowed, so we have to query the
   // original document for any CSS page-size.
-  if (const Maybe<StylePageOrientation> maybeOrientation =
+  if (const Maybe<StylePageSizeOrientation> maybeOrientation =
           aPO->mDocument->GetPresShell()
               ->StyleSet()
-              ->GetDefaultPageOrientation()) {
-    if (maybeOrientation.value() == StylePageOrientation::Landscape &&
+              ->GetDefaultPageSizeOrientation()) {
+    if (maybeOrientation.value() == StylePageSizeOrientation::Landscape &&
         pageSize.width < pageSize.height) {
       // Paper is in portrait, CSS page size is landscape.
       std::swap(pageSize.width, pageSize.height);
-    } else if (maybeOrientation.value() == StylePageOrientation::Portrait &&
+    } else if (maybeOrientation.value() == StylePageSizeOrientation::Portrait &&
                pageSize.width > pageSize.height) {
       // Paper is in landscape, CSS page size is portrait.
       std::swap(pageSize.width, pageSize.height);
@@ -1985,9 +1985,10 @@ nsresult nsPrintJob::FinishPrintPreview() {
     // Determine if there is a specified page size, and if we should set the
     // paper orientation to match it.
     const Maybe<bool> maybeLandscape =
-        mPrintObject->mPresShell->StyleSet()->GetDefaultPageOrientation().map(
-            [](StylePageOrientation o) -> bool {
-              return o == StylePageOrientation::Landscape;
+        mPrintObject->mPresShell->StyleSet()
+            ->GetDefaultPageSizeOrientation()
+            .map([](StylePageSizeOrientation o) -> bool {
+              return o == StylePageSizeOrientation::Landscape;
             });
     mPrintPreviewCallback(PrintPreviewResultInfo(
         GetPrintPreviewNumSheets(), GetRawNumPages(), GetIsEmpty(),
diff --git a/layout/style/ServoStyleSet.cpp b/layout/style/ServoStyleSet.cpp
index 2634c85b5af6..0ee424eea4b9 100644
--- a/layout/style/ServoStyleSet.cpp
+++ b/layout/style/ServoStyleSet.cpp
@@ -635,7 +635,7 @@ StyleSheet* ServoStyleSet::SheetAt(Origin aOrigin, size_t aIndex) const {
       Servo_StyleSet_GetSheetAt(mRawSet.get(), aOrigin, aIndex));
 }
 
-Maybe<StylePageOrientation> ServoStyleSet::GetDefaultPageOrientation() {
+Maybe<StylePageSizeOrientation> ServoStyleSet::GetDefaultPageSizeOrientation() {
   const RefPtr<ComputedStyle> style =
       ResolveNonInheritingAnonymousBoxStyle(PseudoStyleType::pageContent);
   const StylePageSize& pageSize = style->StylePage()->mSize;
@@ -646,10 +646,10 @@ Maybe<StylePageOrientation> ServoStyleSet::GetDefaultPageOrientation() {
     const CSSCoord w = pageSize.AsSize().width.ToCSSPixels();
     const CSSCoord h = pageSize.AsSize().height.ToCSSPixels();
     if (w > h) {
-      return Some(StylePageOrientation::Landscape);
+      return Some(StylePageSizeOrientation::Landscape);
     }
     if (w < h) {
-      return Some(StylePageOrientation::Portrait);
+      return Some(StylePageSizeOrientation::Portrait);
     }
   } else {
     MOZ_ASSERT(pageSize.IsAuto(), "Impossible page size");
diff --git a/layout/style/ServoStyleSet.h b/layout/style/ServoStyleSet.h
index cd5caf6b9ee6..fc2d44e59f38 100644
--- a/layout/style/ServoStyleSet.h
+++ b/layout/style/ServoStyleSet.h
@@ -28,7 +28,7 @@
 
 namespace mozilla {
 enum class MediaFeatureChangeReason : uint16_t;
-enum class StylePageOrientation : uint8_t;
+enum class StylePageSizeOrientation : uint8_t;
 enum class StyleRuleChangeKind : uint32_t;
 
 template <typename Integer, typename Number, typename LinearStops>
@@ -250,7 +250,7 @@ class ServoStyleSet {
   // value to page-size, as well as for an explicit size or paper name which
   // is not square.
   // If the value is auto or square, then returns nothing.
-  Maybe<StylePageOrientation> GetDefaultPageOrientation();
+  Maybe<StylePageSizeOrientation> GetDefaultPageSizeOrientation();
 
   void AppendAllNonDocumentAuthorSheets(nsTArray<StyleSheet*>& aArray) const;
 
diff --git a/servo/components/style/values/computed/mod.rs b/servo/components/style/values/computed/mod.rs
index a38bf049ad05..1d40275db80d 100644
--- a/servo/components/style/values/computed/mod.rs
+++ b/servo/components/style/values/computed/mod.rs
@@ -81,7 +81,7 @@ pub use self::list::ListStyleType;
 pub use self::list::Quotes;
 pub use self::motion::{OffsetPath, OffsetRotate};
 pub use self::outline::OutlineStyle;
-pub use self::page::{PageName, PageOrientation, PageSize, PaperSize};
+pub use self::page::{PageName, PageSize, PageSizeOrientation, PaperSize};
 pub use self::percentage::{NonNegativePercentage, Percentage};
 pub use self::position::AspectRatio;
 pub use self::position::{
diff --git a/servo/components/style/values/computed/page.rs b/servo/components/style/values/computed/page.rs
index 5daf6bbcde82..d54fca329b4a 100644
--- a/servo/components/style/values/computed/page.rs
+++ b/servo/components/style/values/computed/page.rs
@@ -11,7 +11,7 @@ use crate::values::generics::size::Size2D;
 
 use crate::values::specified::page as specified;
 pub use generics::page::GenericPageSize;
-pub use generics::page::PageOrientation;
+pub use generics::page::PageSizeOrientation;
 pub use generics::page::PaperSize;
 pub use specified::PageName;
 
@@ -26,7 +26,7 @@ pub enum PageSize {
     /// Specified size, paper size, or paper size and orientation.
     Size(Size2D<NonNegativeLength>),
     /// `landscape` or `portrait` value, no specified size.
-    Orientation(PageOrientation),
+    Orientation(PageSizeOrientation),
     /// `auto` value
     Auto,
 }
@@ -37,11 +37,11 @@ impl ToComputedValue for specified::PageSize {
     fn to_computed_value(&self, ctx: &Context) -> Self::ComputedValue {
         match &*self {
             Self::Size(s) => PageSize::Size(s.to_computed_value(ctx)),
-            Self::PaperSize(p, PageOrientation::Landscape) => PageSize::Size(Size2D {
+            Self::PaperSize(p, PageSizeOrientation::Landscape) => PageSize::Size(Size2D {
                 width: p.long_edge().to_computed_value(ctx),
                 height: p.short_edge().to_computed_value(ctx),
             }),
-            Self::PaperSize(p, PageOrientation::Portrait) => PageSize::Size(Size2D {
+            Self::PaperSize(p, PageSizeOrientation::Portrait) => PageSize::Size(Size2D {
                 width: p.short_edge().to_computed_value(ctx),
                 height: p.long_edge().to_computed_value(ctx),
             }),
diff --git a/servo/components/style/values/generics/page.rs b/servo/components/style/values/generics/page.rs
index efb67e0812d4..ed81c9e5349f 100644
--- a/servo/components/style/values/generics/page.rs
+++ b/servo/components/style/values/generics/page.rs
@@ -87,7 +87,7 @@ impl PaperSize {
     ToShmem,
 )]
 #[repr(u8)]
-pub enum PageOrientation {
+pub enum PageSizeOrientation {
     /// Portrait orientation
     Portrait,
     /// Landscape orientation
@@ -95,8 +95,8 @@ pub enum PageOrientation {
 }
 
 #[inline]
-fn is_portrait(orientation: &PageOrientation) -> bool {
-    *orientation == PageOrientation::Portrait
+fn is_portrait(orientation: &PageSizeOrientation) -> bool {
+    *orientation == PageSizeOrientation::Portrait
 }
 
 /// Page size property
@@ -110,9 +110,9 @@ pub enum GenericPageSize<S> {
     /// Page dimensions.
     Size(S),
     /// An orientation with no size.
-    Orientation(PageOrientation),
+    Orientation(PageSizeOrientation),
     /// Paper size by name
-    PaperSize(PaperSize, #[css(skip_if = "is_portrait")] PageOrientation),
+    PaperSize(PaperSize, #[css(skip_if = "is_portrait")] PageSizeOrientation),
 }
 
 pub use self::GenericPageSize as PageSize;
diff --git a/servo/components/style/values/specified/mod.rs b/servo/components/style/values/specified/mod.rs
index 7fa2c57549a1..9dbf0ec38528 100644
--- a/servo/components/style/values/specified/mod.rs
+++ b/servo/components/style/values/specified/mod.rs
@@ -72,7 +72,7 @@ pub use self::list::ListStyleType;
 pub use self::list::Quotes;
 pub use self::motion::{OffsetPath, OffsetRotate};
 pub use self::outline::OutlineStyle;
-pub use self::page::{PageName, PageOrientation, PageSize, PaperSize};
+pub use self::page::{PageName, PageSize, PageSizeOrientation, PaperSize};
 pub use self::percentage::{NonNegativePercentage, Percentage};
 pub use self::position::AspectRatio;
 pub use self::position::{
diff --git a/servo/components/style/values/specified/page.rs b/servo/components/style/values/specified/page.rs
index e660b435327f..f8727a9c1d3f 100644
--- a/servo/components/style/values/specified/page.rs
+++ b/servo/components/style/values/specified/page.rs
@@ -11,7 +11,7 @@ use crate::values::{generics, CustomIdent};
 use cssparser::Parser;
 use style_traits::ParseError;
 
-pub use generics::page::PageOrientation;
+pub use generics::page::PageSizeOrientation;
 pub use generics::page::PaperSize;
 /// Specified value of the @page size descriptor
 pub type PageSize = generics::page::PageSize<Size2D<NonNegativeLength>>;
@@ -24,12 +24,12 @@ impl Parse for PageSize {
         // Try to parse as <page-size> [ <orientation> ]
         if let Ok(paper_size) = input.try_parse(PaperSize::parse) {
             let orientation = input
-                .try_parse(PageOrientation::parse)
-                .unwrap_or(PageOrientation::Portrait);
+                .try_parse(PageSizeOrientation::parse)
+                .unwrap_or(PageSizeOrientation::Portrait);
             return Ok(PageSize::PaperSize(paper_size, orientation));
         }
         // Try to parse as <orientation> [ <page-size> ]
-        if let Ok(orientation) = input.try_parse(PageOrientation::parse) {
+        if let Ok(orientation) = input.try_parse(PageSizeOrientation::parse) {
             if let Ok(paper_size) = input.try_parse(PaperSize::parse) {
                 return Ok(PageSize::PaperSize(paper_size, orientation));
             }