diff --git a/components/script/dom/attr.rs b/components/script/dom/attr.rs
index b8633619bbb..b641fa5d615 100644
--- a/components/script/dom/attr.rs
+++ b/components/script/dom/attr.rs
@@ -235,9 +235,9 @@ impl Attr {
 #[allow(unsafe_code)]
 pub trait AttrHelpersForLayout<'dom> {
     fn value(self) -> &'dom AttrValue;
-    fn value_ref_forever(self) -> &'dom str;
-    fn value_tokens(self) -> Option<&'dom [Atom]>;
-    fn local_name_atom(self) -> LocalName;
+    fn as_str(self) -> &'dom str;
+    fn as_tokens(self) -> Option<&'dom [Atom]>;
+    fn local_name(self) -> LocalName;
 }
 
 #[allow(unsafe_code)]
@@ -248,12 +248,12 @@ impl<'dom> AttrHelpersForLayout<'dom> for LayoutDom<'dom, Attr> {
     }
 
     #[inline]
-    fn value_ref_forever(self) -> &'dom str {
+    fn as_str(self) -> &'dom str {
         &**self.value()
     }
 
     #[inline]
-    fn value_tokens(self) -> Option<&'dom [Atom]> {
+    fn as_tokens(self) -> Option<&'dom [Atom]> {
         // This transmute is used to cheat the lifetime restriction.
         match *self.value() {
             AttrValue::TokenList(_, ref tokens) => Some(tokens),
@@ -262,7 +262,7 @@ impl<'dom> AttrHelpersForLayout<'dom> for LayoutDom<'dom, Attr> {
     }
 
     #[inline]
-    fn local_name_atom(self) -> LocalName {
+    fn local_name(self) -> LocalName {
         unsafe { self.unsafe_get().identifier.local_name.clone() }
     }
 }
diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs
index 602cb148d7a..35f952a676c 100644
--- a/components/script/dom/element.rs
+++ b/components/script/dom/element.rs
@@ -578,7 +578,7 @@ pub unsafe fn get_attr_for_layout<'dom>(
         .iter()
         .find(|attr| {
             let attr = attr.to_layout();
-            *name == attr.local_name_atom() && (*attr.unsafe_get()).namespace() == namespace
+            *name == attr.local_name() && (*attr.unsafe_get()).namespace() == namespace
         })
         .map(|attr| attr.to_layout())
 }
@@ -600,7 +600,7 @@ impl RawLayoutElementHelpers for Element {
         namespace: &Namespace,
         name: &LocalName,
     ) -> Option<&'a str> {
-        get_attr_for_layout(self, namespace, name).map(|attr| attr.value_ref_forever())
+        get_attr_for_layout(self, namespace, name).map(|attr| attr.as_str())
     }
 
     #[inline]
@@ -610,7 +610,7 @@ impl RawLayoutElementHelpers for Element {
             .iter()
             .filter_map(|attr| {
                 let attr = attr.to_layout();
-                if *name == attr.local_name_atom() {
+                if *name == attr.local_name() {
                     Some(attr.value())
                 } else {
                     None
@@ -656,7 +656,7 @@ impl<'dom> LayoutElementHelpers<'dom> for LayoutDom<'dom, Element> {
         get_attr_for_layout(&*self.unsafe_get(), &ns!(), &local_name!("class")).map_or(
             false,
             |attr| {
-                attr.value_tokens()
+                attr.as_tokens()
                     .unwrap()
                     .iter()
                     .any(|atom| case_sensitivity.eq_atom(atom, name))
@@ -668,7 +668,7 @@ impl<'dom> LayoutElementHelpers<'dom> for LayoutDom<'dom, Element> {
     #[inline]
     unsafe fn get_classes_for_layout(self) -> Option<&'dom [Atom]> {
         get_attr_for_layout(&*self.unsafe_get(), &ns!(), &local_name!("class"))
-            .map(|attr| attr.value_tokens().unwrap())
+            .map(|attr| attr.as_tokens().unwrap())
     }
 
     #[allow(unsafe_code)]