diff --git a/servo/components/style/Cargo.toml b/servo/components/style/Cargo.toml
index 799a888b13ca..b098f413aeff 100644
--- a/servo/components/style/Cargo.toml
+++ b/servo/components/style/Cargo.toml
@@ -38,7 +38,7 @@ servo = [
     "markup5ever",
     "serde",
     "servo_arc/servo",
-    "servo_atoms",
+    "stylo_atoms",
     "servo_config",
     "string_cache",
     "style_traits/servo",
@@ -84,7 +84,7 @@ rayon-core = "1"
 selectors = { path = "../selectors" }
 serde = {version = "1.0", optional = true, features = ["derive"]}
 servo_arc = { path = "../servo_arc" }
-servo_atoms = {path = "../atoms", optional = true}
+stylo_atoms = {path = "../atoms", optional = true}
 servo_config = {path = "../config", optional = true}
 smallbitvec = "2.3.0"
 smallvec = "1.0"
diff --git a/servo/components/style/context.rs b/servo/components/style/context.rs
index b62556294fe2..e151967ca49b 100644
--- a/servo/components/style/context.rs
+++ b/servo/components/style/context.rs
@@ -34,7 +34,7 @@ use selectors::context::SelectorCaches;
 #[cfg(feature = "gecko")]
 use servo_arc::Arc;
 #[cfg(feature = "servo")]
-use servo_atoms::Atom;
+use stylo_atoms::Atom;
 use std::fmt;
 use std::ops;
 use std::time::{Duration, Instant};
diff --git a/servo/components/style/lib.rs b/servo/components/style/lib.rs
index 578ac5baba37..8ff95086e99e 100644
--- a/servo/components/style/lib.rs
+++ b/servo/components/style/lib.rs
@@ -64,7 +64,7 @@ extern crate serde;
 pub use servo_arc;
 #[cfg(feature = "servo")]
 #[macro_use]
-extern crate servo_atoms;
+extern crate stylo_atoms;
 #[macro_use]
 extern crate static_assertions;
 #[macro_use]
@@ -155,7 +155,7 @@ pub type LocalName = crate::values::AtomIdent;
 pub use crate::gecko_string_cache::Namespace;
 
 #[cfg(feature = "servo")]
-pub use servo_atoms::Atom;
+pub use stylo_atoms::Atom;
 
 #[cfg(feature = "servo")]
 #[allow(missing_docs)]
@@ -202,7 +202,7 @@ longhand_properties_idents!(reexport_computed_values);
 #[cfg(feature = "gecko")]
 use crate::gecko_string_cache::WeakAtom;
 #[cfg(feature = "servo")]
-use servo_atoms::Atom as WeakAtom;
+use stylo_atoms::Atom as WeakAtom;
 
 /// Extension methods for selectors::attr::CaseSensitivity
 pub trait CaseSensitivityExt {
diff --git a/servo/components/style/values/mod.rs b/servo/components/style/values/mod.rs
index f948150c2faf..91e8c76e9397 100644
--- a/servo/components/style/values/mod.rs
+++ b/servo/components/style/values/mod.rs
@@ -227,7 +227,7 @@ where
 
 /// A generic CSS `<ident>` stored as an `Atom`, for the default atom set.
 #[cfg(feature = "servo")]
-pub type AtomIdent = GenericAtomIdent<servo_atoms::AtomStaticSet>;
+pub type AtomIdent = GenericAtomIdent<stylo_atoms::AtomStaticSet>;
 
 #[cfg(feature = "servo")]
 impl<Set: string_cache::StaticAtomSet> style_traits::SpecifiedValueInfo for GenericAtomIdent<Set> {}
diff --git a/servo/components/style_traits/Cargo.toml b/servo/components/style_traits/Cargo.toml
index c267c3b6fd91..eea00a10a2f7 100644
--- a/servo/components/style_traits/Cargo.toml
+++ b/servo/components/style_traits/Cargo.toml
@@ -12,7 +12,7 @@ name = "style_traits"
 path = "lib.rs"
 
 [features]
-servo = ["servo_atoms", "cssparser/serde", "url", "euclid/serde"]
+servo = ["stylo_atoms", "cssparser/serde", "url", "euclid/serde"]
 gecko = ["nsstring"]
 
 [dependencies]
@@ -26,7 +26,7 @@ nsstring = {path = "../../../xpcom/rust/nsstring/", optional = true}
 selectors = { path = "../selectors" }
 serde = "1.0"
 servo_arc = { path = "../servo_arc" }
-servo_atoms = { path = "../atoms", optional = true }
+stylo_atoms = { path = "../atoms", optional = true }
 thin-vec = "0.2"
 to_shmem = { path = "../to_shmem" }
 to_shmem_derive = { path = "../to_shmem_derive" }
diff --git a/servo/components/style_traits/lib.rs b/servo/components/style_traits/lib.rs
index bc57d9f48983..8c336c2d3f25 100644
--- a/servo/components/style_traits/lib.rs
+++ b/servo/components/style_traits/lib.rs
@@ -23,7 +23,7 @@ use bitflags::bitflags;
 use cssparser::{CowRcStr, Token};
 use selectors::parser::SelectorParseErrorKind;
 #[cfg(feature = "servo")]
-use servo_atoms::Atom;
+use stylo_atoms::Atom;
 
 /// One hardware pixel.
 ///
diff --git a/servo/components/style_traits/specified_value_info.rs b/servo/components/style_traits/specified_value_info.rs
index ed3ed448d86e..4cbcf8275965 100644
--- a/servo/components/style_traits/specified_value_info.rs
+++ b/servo/components/style_traits/specified_value_info.rs
@@ -89,7 +89,7 @@ impl SpecifiedValueInfo for String {}
 impl SpecifiedValueInfo for crate::owned_str::OwnedStr {}
 
 #[cfg(feature = "servo")]
-impl SpecifiedValueInfo for ::servo_atoms::Atom {}
+impl SpecifiedValueInfo for ::stylo_atoms::Atom {}
 #[cfg(feature = "servo")]
 impl SpecifiedValueInfo for ::url::Url {}
 
diff --git a/servo/tests/unit/style/Cargo.toml b/servo/tests/unit/style/Cargo.toml
index 7116f30b9dce..65b64ea7ea0f 100644
--- a/servo/tests/unit/style/Cargo.toml
+++ b/servo/tests/unit/style/Cargo.toml
@@ -20,7 +20,7 @@ rayon = "1"
 serde_json = "1.0"
 selectors = {path = "../../../components/selectors"}
 servo_arc = {path = "../../../components/servo_arc"}
-servo_atoms = {path = "../../../components/atoms"}
+stylo_atoms = {path = "../../../components/atoms"}
 servo_config = {path = "../../../components/config"}
 servo_url = {path = "../../../components/url"}
 size_of_test = {path = "../../../components/size_of_test"}
diff --git a/servo/tests/unit/style/lib.rs b/servo/tests/unit/style/lib.rs
index 998cb9534df0..f8826f488216 100644
--- a/servo/tests/unit/style/lib.rs
+++ b/servo/tests/unit/style/lib.rs
@@ -14,7 +14,7 @@ extern crate rayon;
 extern crate selectors;
 extern crate serde_json;
 extern crate servo_arc;
-extern crate servo_atoms;
+extern crate stylo_atoms;
 extern crate servo_config;
 extern crate servo_url;
 #[macro_use] extern crate style;
diff --git a/servo/tests/unit/style/parsing/animation.rs b/servo/tests/unit/style/parsing/animation.rs
index 1b7481c4afb7..9284b9d37150 100644
--- a/servo/tests/unit/style/parsing/animation.rs
+++ b/servo/tests/unit/style/parsing/animation.rs
@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use parsing::parse;
-use servo_atoms::Atom;
+use stylo_atoms::Atom;
 use style::parser::Parse;
 use style::properties::longhands::animation_name;
 use style::values::specified::AnimationIterationCount;
diff --git a/servo/tests/unit/style/stylesheets.rs b/servo/tests/unit/style/stylesheets.rs
index 8caed3db2722..74a784a347d0 100644
--- a/servo/tests/unit/style/stylesheets.rs
+++ b/servo/tests/unit/style/stylesheets.rs
@@ -8,7 +8,7 @@ use parking_lot::RwLock;
 use selectors::attr::*;
 use selectors::parser::*;
 use servo_arc::Arc;
-use servo_atoms::Atom;
+use stylo_atoms::Atom;
 use servo_config::prefs::{PrefValue, PREFS};
 use servo_url::ServoUrl;
 use std::borrow::ToOwned;
diff --git a/servo/tests/unit/style/stylist.rs b/servo/tests/unit/style/stylist.rs
index 0d7511f05835..de21579f90b2 100644
--- a/servo/tests/unit/style/stylist.rs
+++ b/servo/tests/unit/style/stylist.rs
@@ -7,7 +7,7 @@ use euclid::Scale;
 use euclid::Size2D;
 use selectors::parser::{AncestorHashes, Selector};
 use servo_arc::Arc;
-use servo_atoms::Atom;
+use stylo_atoms::Atom;
 use style::context::QuirksMode;
 use style::media_queries::{Device, MediaType};
 use style::properties::{longhands, Importance};