3 files changed, 8 insertions, 8 deletions
diff --git a/components/script/dom/servoparser/html.rs b/components/script/dom/servoparser/html.rs
index 91e4277f4c3..fd4a5a923b9 100644
--- a/components/script/dom/servoparser/html.rs
+++ b/components/script/dom/servoparser/html.rs
@@ -32,10 +32,10 @@ use html5ever::tendril::StrTendril;
 use html5ever::tokenizer::{Tokenizer as H5ETokenizer, TokenizerOpts};
 use html5ever::tree_builder::{NextParserState, NodeOrText, QuirksMode};
 use html5ever::tree_builder::{TreeBuilder, TreeBuilderOpts, TreeSink};
+use html5ever_atoms::QualName;
 use msg::constellation_msg::PipelineId;
 use std::borrow::Cow;
 use std::io::{self, Write};
-use string_cache::QualName;
 use super::{HtmlTokenizer, LastChunkState, ServoParser, Sink, Tokenizer};
 use url::Url;
 
diff --git a/components/script/dom/servoparser/mod.rs b/components/script/dom/servoparser/mod.rs
index b11dd46477c..4df82a457a7 100644
--- a/components/script/dom/servoparser/mod.rs
+++ b/components/script/dom/servoparser/mod.rs
@@ -406,7 +406,7 @@ impl FetchResponseListener for ParserContext {
 
                 let doc = parser.document();
                 let doc_body = Root::upcast::<Node>(doc.GetBody().unwrap());
-                let img = HTMLImageElement::new(atom!("img"), None, doc);
+                let img = HTMLImageElement::new(local_name!("img"), None, doc);
                 img.SetSrc(DOMString::from(self.url.to_string()));
                 doc_body.AppendChild(&Root::upcast::<Node>(img)).expect("Appending failed");
 
diff --git a/components/script/dom/servoparser/xml.rs b/components/script/dom/servoparser/xml.rs
index e37feb43da7..879bb9320d6 100644
--- a/components/script/dom/servoparser/xml.rs
+++ b/components/script/dom/servoparser/xml.rs
@@ -17,9 +17,9 @@ use dom::node::Node;
 use dom::processinginstruction::ProcessingInstruction;
 use dom::text::Text;
 use html5ever;
+use html5ever_atoms::{Prefix, QualName};
 use msg::constellation_msg::PipelineId;
 use std::borrow::Cow;
-use string_cache::{Atom, QualName, Namespace};
 use super::{LastChunkState, ServoParser, Sink, Tokenizer};
 use url::Url;
 use xml5ever::tendril::StrTendril;
@@ -41,17 +41,17 @@ impl<'a> TreeSink for Sink {
         let elem = target.downcast::<Element>()
             .expect("tried to get name of non-Element in XML parsing");
         QName {
-            prefix: elem.prefix().as_ref().map_or(atom!(""), |p| Atom::from(&**p)),
-            namespace_url: elem.namespace().0.clone(),
+            prefix: elem.prefix().as_ref().map_or(namespace_prefix!(""), |p| Prefix::from(&**p)),
+            namespace_url: elem.namespace().clone(),
             local: elem.local_name().clone(),
         }
     }
 
     fn create_element(&mut self, name: QName, attrs: Vec<Attribute>)
             -> JS<Node> {
-        let prefix = if name.prefix == atom!("") { None } else { Some(name.prefix) };
+        let prefix = if name.prefix == namespace_prefix!("") { None } else { Some(name.prefix) };
         let name = QualName {
-            ns: Namespace(name.namespace_url),
+            ns: name.namespace_url,
             local: name.local,
         };
         let elem = Element::create(name, prefix, &*self.document,
@@ -59,7 +59,7 @@ impl<'a> TreeSink for Sink {
 
         for attr in attrs {
             let name = QualName {
-                ns: Namespace(attr.name.namespace_url),
+                ns: attr.name.namespace_url,
                 local: attr.name.local,
             };
             elem.set_attribute_from_parser(name, DOMString::from(String::from(attr.value)), None);