--- a/gfx/webrender_bindings/WebRenderAPI.cpp
+++ b/gfx/webrender_bindings/WebRenderAPI.cpp
@@ -575,21 +575,21 @@ DisplayListBuilder::PushBuiltDisplayList
   wr_dp_push_built_display_list(mWrState,
                                 dl.dl_desc,
                                 dl.dl.Extract(),
                                 dl.aux_desc,
                                 dl.aux.Extract());
 }
 
 void
-DisplayListBuilder::PushScrollLayer(const WrRect& aBounds,
-                                    const WrRect& aOverflow,
+DisplayListBuilder::PushScrollLayer(const WrRect& aContentRect,
+                                    const WrRect& aClipRect,
                                     const WrImageMask* aMask)
 {
-  wr_dp_push_scroll_layer(mWrState, aBounds, aOverflow, aMask);
+  wr_dp_push_scroll_layer(mWrState, aContentRect, aClipRect, aMask);
 }
 
 void
 DisplayListBuilder::PopScrollLayer()
 {
   wr_dp_pop_scroll_layer(mWrState);
 }
 

--- a/gfx/webrender_bindings/WebRenderAPI.h
+++ b/gfx/webrender_bindings/WebRenderAPI.h
@@ -148,20 +148,19 @@ public:
                            const uint64_t& aAnimationId,
                            const float* aOpacity,
                            const gfx::Matrix4x4* aTransform,
                            const WrMixBlendMode& aMixBlendMode);
   void PopStackingContext();
 
   void PushBuiltDisplayList(wr::BuiltDisplayList dl);
 
-  void PushScrollLayer(const WrRect& aBounds, // TODO: We should work with strongly typed rects
-                       const WrRect& aOverflow,
+  void PushScrollLayer(const WrRect& aContentRect, // TODO: We should work with strongly typed rects
+                       const WrRect& aClipRect,
                        const WrImageMask* aMask); // TODO: needs a wrapper.
-
   void PopScrollLayer();
 
 
   void PushRect(const WrRect& aBounds,
                 const WrClipRegion& aClip,
                 const WrColor& aColor);
 
   void PushLinearGradient(const WrRect& aBounds,

--- a/gfx/webrender_bindings/src/bindings.rs
+++ b/gfx/webrender_bindings/src/bindings.rs
@@ -1221,31 +1221,31 @@ pub extern "C" fn wr_dp_push_stacking_co
 #[no_mangle]
 pub extern "C" fn wr_dp_pop_stacking_context(state: &mut WrState) {
     assert!(unsafe { is_in_main_thread() });
     state.frame_builder.dl_builder.pop_stacking_context();
 }
 
 #[no_mangle]
 pub extern "C" fn wr_dp_push_scroll_layer(state: &mut WrState,
-                                          bounds: WrRect,
-                                          overflow: WrRect,
+                                          content_rect: WrRect,
+                                          clip_rect: WrRect,
                                           mask: *const WrImageMask) {
-    let bounds = bounds.to_rect();
-    let overflow = overflow.to_rect();
+    let content_rect = content_rect.to_rect();
+    let clip_rect = clip_rect.to_rect();
     let mask = unsafe { mask.as_ref() };
     let mask = mask.map(|&WrImageMask { image, ref rect, repeat }| {
         ImageMask {
             image: image,
             rect: rect.to_rect(),
             repeat: repeat,
         }
     });
-    let clip_region = state.frame_builder.dl_builder.new_clip_region(&overflow, vec![], mask);
-    state.frame_builder.dl_builder.push_scroll_layer(clip_region, bounds, None);
+    let clip_region = state.frame_builder.dl_builder.new_clip_region(&clip_rect, vec![], mask);
+    state.frame_builder.dl_builder.push_scroll_layer(clip_region, content_rect, None);
 }
 
 #[no_mangle]
 pub extern "C" fn wr_dp_pop_scroll_layer(state: &mut WrState) {
     assert!(unsafe { is_in_main_thread() });
     state.frame_builder.dl_builder.pop_scroll_layer();
 }
 

--- a/gfx/webrender_bindings/webrender_ffi_generated.h
+++ b/gfx/webrender_bindings/webrender_ffi_generated.h
@@ -771,18 +771,18 @@ WR_INLINE void
 wr_dp_push_rect(WrState* state,
     WrRect rect,
     WrClipRegion clip,
     WrColor color)
 WR_FUNC;
 
 WR_INLINE void
 wr_dp_push_scroll_layer(WrState* state,
-    WrRect bounds,
-    WrRect overflow,
+    WrRect content_rect,
+    WrRect clip_rect,
     const WrImageMask* mask)
 WR_FUNC;
 
 WR_INLINE void
 wr_dp_push_stacking_context(WrState* state,
     WrRect bounds,
     uint64_t animation_id,
     const float* opacity,