diff --git a/cranelift/docs/langref.rst b/cranelift/docs/langref.rst
index 070b27ee37..33fc1f0694 100644
--- a/cranelift/docs/langref.rst
+++ b/cranelift/docs/langref.rst
@@ -74,7 +74,7 @@ SSA values: In the entry block, ``v4`` is the initial value. In the loop block
 variable during each iteration. Finally, ``v12`` is computed as the induction
 variable value for the next iteration.
 
-The `cton_frontend` crate contains utilities for translating from programs
+The `cretonne_frontend` crate contains utilities for translating from programs
 containing multiple assignments to the same variables into SSA form for
 Cretonne :term:`IR`.
 
diff --git a/cranelift/src/cat.rs b/cranelift/src/cat.rs
index e82af42624..c4890ffb24 100644
--- a/cranelift/src/cat.rs
+++ b/cranelift/src/cat.rs
@@ -4,7 +4,7 @@
 //! normalizing formatting and removing comments.
 
 use CommandResult;
-use cton_reader::parse_functions;
+use cretonne_reader::parse_functions;
 use utils::read_to_string;
 
 pub fn run(files: &[String]) -> CommandResult {
diff --git a/cranelift/src/compile.rs b/cranelift/src/compile.rs
index 6bab77e0d2..722f5b83c7 100644
--- a/cranelift/src/compile.rs
+++ b/cranelift/src/compile.rs
@@ -4,7 +4,7 @@ use cretonne::Context;
 use cretonne::print_errors::pretty_error;
 use cretonne::settings::FlagsOrIsa;
 use cretonne::{binemit, ir};
-use cton_reader::parse_test;
+use cretonne_reader::parse_test;
 use std::path::Path;
 use std::path::PathBuf;
 use utils::{parse_sets_and_isa, read_to_string};
diff --git a/cranelift/src/cton-util.rs b/cranelift/src/cton-util.rs
index 3968030709..7ab78d649a 100644
--- a/cranelift/src/cton-util.rs
+++ b/cranelift/src/cton-util.rs
@@ -1,7 +1,7 @@
 extern crate cretonne;
-extern crate cton_filetests;
-extern crate cton_reader;
-extern crate cton_wasm;
+extern crate cretonne_filetests;
+extern crate cretonne_reader;
+extern crate cretonne_wasm;
 extern crate docopt;
 extern crate filecheck;
 #[macro_use]
@@ -86,7 +86,7 @@ fn cton_util() -> CommandResult {
 
     // Find the sub-command to execute.
     let result = if args.cmd_test {
-        cton_filetests::run(args.flag_verbose, &args.arg_file).map(|_time| ())
+        cretonne_filetests::run(args.flag_verbose, &args.arg_file).map(|_time| ())
     } else if args.cmd_cat {
         cat::run(&args.arg_file)
     } else if args.cmd_filecheck {
diff --git a/cranelift/src/print_cfg.rs b/cranelift/src/print_cfg.rs
index 846ee3e8fa..8dbd4324fc 100644
--- a/cranelift/src/print_cfg.rs
+++ b/cranelift/src/print_cfg.rs
@@ -5,7 +5,7 @@
 
 use CommandResult;
 use cretonne::cfg_printer::CFGPrinter;
-use cton_reader::parse_functions;
+use cretonne_reader::parse_functions;
 use utils::read_to_string;
 
 pub fn run(files: &[String]) -> CommandResult {
diff --git a/cranelift/src/utils.rs b/cranelift/src/utils.rs
index 8a2994a7ab..fe43be14ab 100644
--- a/cranelift/src/utils.rs
+++ b/cranelift/src/utils.rs
@@ -3,7 +3,7 @@
 use cretonne::isa;
 use cretonne::isa::TargetIsa;
 use cretonne::settings::{self, FlagsOrIsa};
-use cton_reader::{parse_options, Location};
+use cretonne_reader::{parse_options, Location};
 use std::fs::File;
 use std::io::{self, Read};
 use std::path::Path;
diff --git a/cranelift/src/wasm.rs b/cranelift/src/wasm.rs
index 029c7ad5c0..1cbe2c754b 100644
--- a/cranelift/src/wasm.rs
+++ b/cranelift/src/wasm.rs
@@ -1,4 +1,5 @@
-//! CLI tool to use the functions provided by the [cretonne-wasm](../cton_wasm/index.html) crate.
+//! CLI tool to use the functions provided by the [cretonne-wasm](../cretonne_wasm/index.html)
+//! crate.
 //!
 //! Reads Wasm binary files, translates the functions' code to Cretonne IR.
 #![cfg_attr(feature = "cargo-clippy", allow(too_many_arguments, cyclomatic_complexity))]
@@ -6,7 +7,7 @@
 use cretonne::Context;
 use cretonne::print_errors::{pretty_error, pretty_verifier_error};
 use cretonne::settings::FlagsOrIsa;
-use cton_wasm::{translate_module, DummyEnvironment, ModuleEnvironment};
+use cretonne_wasm::{translate_module, DummyEnvironment, ModuleEnvironment};
 use std::error::Error;
 use std::fs::File;
 use std::io;
diff --git a/cranelift/tests/filetests.rs b/cranelift/tests/filetests.rs
index 6b5e392c76..d99f168b61 100644
--- a/cranelift/tests/filetests.rs
+++ b/cranelift/tests/filetests.rs
@@ -1,7 +1,7 @@
-extern crate cton_filetests;
+extern crate cretonne_filetests;
 
 #[test]
 fn filetests() {
     // Run all the filetests in the following directories.
-    cton_filetests::run(false, &["filetests".into(), "docs".into()]).expect("test harness");
+    cretonne_filetests::run(false, &["filetests".into(), "docs".into()]).expect("test harness");
 }
diff --git a/lib/cretonne/Cargo.toml b/lib/cretonne/Cargo.toml
index 1b93158451..d252fec291 100644
--- a/lib/cretonne/Cargo.toml
+++ b/lib/cretonne/Cargo.toml
@@ -10,9 +10,6 @@ readme = "README.md"
 keywords = ["compile", "compiler", "jit"]
 build = "build.rs"
 
-[lib]
-name = "cretonne"
-
 [dependencies]
 cretonne-entity = { path = "../entity", version = "0.4.4" }
 # It is a goal of the cretonne crate to have minimal external dependencies.
diff --git a/lib/cretonne/src/lib.rs b/lib/cretonne/src/lib.rs
index 996bb865bd..8bc88ab420 100644
--- a/lib/cretonne/src/lib.rs
+++ b/lib/cretonne/src/lib.rs
@@ -39,7 +39,7 @@ pub use write::write_function;
 pub const VERSION: &str = env!("CARGO_PKG_VERSION");
 
 #[macro_use]
-pub extern crate cton_entity as entity;
+pub extern crate cretonne_entity as entity;
 
 #[macro_use]
 pub mod dbg;
diff --git a/lib/entity/Cargo.toml b/lib/entity/Cargo.toml
index 726f85e46b..fa862aef94 100644
--- a/lib/entity/Cargo.toml
+++ b/lib/entity/Cargo.toml
@@ -9,9 +9,6 @@ repository = "https://github.com/Cretonne/cretonne"
 readme = "README.md"
 keywords = ["entity", "set", "map"]
 
-[lib]
-name = "cton_entity"
-
 [features]
 default = ["std"]
 std = []
diff --git a/lib/filetests/Cargo.toml b/lib/filetests/Cargo.toml
index 0c7b7d5739..e0187f3f75 100644
--- a/lib/filetests/Cargo.toml
+++ b/lib/filetests/Cargo.toml
@@ -8,9 +8,6 @@ documentation = "http://cretonne.readthedocs.io/en/latest/testing.html#file-test
 repository = "https://github.com/Cretonne/cretonne"
 publish = false
 
-[lib]
-name = "cton_filetests"
-
 [dependencies]
 cretonne = { path = "../cretonne", version = "0.4.4" }
 cretonne-reader = { path = "../reader", version = "0.4.4" }
diff --git a/lib/filetests/src/lib.rs b/lib/filetests/src/lib.rs
index 718502eb53..d58f15fdc0 100644
--- a/lib/filetests/src/lib.rs
+++ b/lib/filetests/src/lib.rs
@@ -10,11 +10,11 @@
 
 #[macro_use(dbg)]
 extern crate cretonne;
-extern crate cton_reader;
+extern crate cretonne_reader;
 extern crate filecheck;
 extern crate num_cpus;
 
-use cton_reader::TestCommand;
+use cretonne_reader::TestCommand;
 use runner::TestRunner;
 use std::path::Path;
 use std::time;
diff --git a/lib/filetests/src/runone.rs b/lib/filetests/src/runone.rs
index 8cdec2d626..dee5bfc2c9 100644
--- a/lib/filetests/src/runone.rs
+++ b/lib/filetests/src/runone.rs
@@ -6,8 +6,8 @@ use cretonne::print_errors::pretty_verifier_error;
 use cretonne::settings::Flags;
 use cretonne::timing;
 use cretonne::verify_function;
-use cton_reader::IsaSpec;
-use cton_reader::parse_test;
+use cretonne_reader::IsaSpec;
+use cretonne_reader::parse_test;
 use std::borrow::Cow;
 use std::fs;
 use std::io::{self, Read};
diff --git a/lib/filetests/src/subtest.rs b/lib/filetests/src/subtest.rs
index ba94f87e78..4ae71494d7 100644
--- a/lib/filetests/src/subtest.rs
+++ b/lib/filetests/src/subtest.rs
@@ -3,7 +3,7 @@
 use cretonne::ir::Function;
 use cretonne::isa::TargetIsa;
 use cretonne::settings::{Flags, FlagsOrIsa};
-use cton_reader::{Comment, Details};
+use cretonne_reader::{Comment, Details};
 use filecheck::{Checker, CheckerBuilder, NO_VARIABLES};
 use std::borrow::Cow;
 use std::result;
diff --git a/lib/filetests/src/test_binemit.rs b/lib/filetests/src/test_binemit.rs
index ce2e97e888..620eb7e9f3 100644
--- a/lib/filetests/src/test_binemit.rs
+++ b/lib/filetests/src/test_binemit.rs
@@ -9,7 +9,7 @@ use cretonne::dbg::DisplayList;
 use cretonne::ir;
 use cretonne::ir::entities::AnyEntity;
 use cretonne::print_errors::pretty_error;
-use cton_reader::TestCommand;
+use cretonne_reader::TestCommand;
 use match_directive::match_directive;
 use std::borrow::Cow;
 use std::collections::HashMap;
diff --git a/lib/filetests/src/test_cat.rs b/lib/filetests/src/test_cat.rs
index f8f145834c..3d04fcae3e 100644
--- a/lib/filetests/src/test_cat.rs
+++ b/lib/filetests/src/test_cat.rs
@@ -1,7 +1,7 @@
 //! The `cat` subtest.
 
 use cretonne::ir::Function;
-use cton_reader::TestCommand;
+use cretonne_reader::TestCommand;
 use std::borrow::Cow;
 use subtest::{self, Context, Result as STResult, SubTest};
 
diff --git a/lib/filetests/src/test_compile.rs b/lib/filetests/src/test_compile.rs
index a924eee799..a5af1f54e7 100644
--- a/lib/filetests/src/test_compile.rs
+++ b/lib/filetests/src/test_compile.rs
@@ -6,7 +6,7 @@ use cretonne;
 use cretonne::binemit;
 use cretonne::ir;
 use cretonne::print_errors::pretty_error;
-use cton_reader::TestCommand;
+use cretonne_reader::TestCommand;
 use std::borrow::Cow;
 use std::fmt::Write;
 use subtest::{run_filecheck, Context, Result, SubTest};
diff --git a/lib/filetests/src/test_dce.rs b/lib/filetests/src/test_dce.rs
index d96214182b..4d79cea1ce 100644
--- a/lib/filetests/src/test_dce.rs
+++ b/lib/filetests/src/test_dce.rs
@@ -8,7 +8,7 @@
 use cretonne;
 use cretonne::ir::Function;
 use cretonne::print_errors::pretty_error;
-use cton_reader::TestCommand;
+use cretonne_reader::TestCommand;
 use std::borrow::Cow;
 use std::fmt::Write;
 use subtest::{run_filecheck, Context, Result, SubTest};
diff --git a/lib/filetests/src/test_domtree.rs b/lib/filetests/src/test_domtree.rs
index da5a926f3d..9862f3f4fe 100644
--- a/lib/filetests/src/test_domtree.rs
+++ b/lib/filetests/src/test_domtree.rs
@@ -16,7 +16,7 @@ use cretonne::dominator_tree::{DominatorTree, DominatorTreePreorder};
 use cretonne::flowgraph::ControlFlowGraph;
 use cretonne::ir::Function;
 use cretonne::ir::entities::AnyEntity;
-use cton_reader::TestCommand;
+use cretonne_reader::TestCommand;
 use match_directive::match_directive;
 use std::borrow::{Borrow, Cow};
 use std::collections::HashMap;
diff --git a/lib/filetests/src/test_legalizer.rs b/lib/filetests/src/test_legalizer.rs
index 0794081e51..af288bcc8d 100644
--- a/lib/filetests/src/test_legalizer.rs
+++ b/lib/filetests/src/test_legalizer.rs
@@ -6,7 +6,7 @@
 use cretonne;
 use cretonne::ir::Function;
 use cretonne::print_errors::pretty_error;
-use cton_reader::TestCommand;
+use cretonne_reader::TestCommand;
 use std::borrow::Cow;
 use std::fmt::Write;
 use subtest::{run_filecheck, Context, Result, SubTest};
diff --git a/lib/filetests/src/test_licm.rs b/lib/filetests/src/test_licm.rs
index c59dee1cba..435b5ab1bc 100644
--- a/lib/filetests/src/test_licm.rs
+++ b/lib/filetests/src/test_licm.rs
@@ -8,7 +8,7 @@
 use cretonne;
 use cretonne::ir::Function;
 use cretonne::print_errors::pretty_error;
-use cton_reader::TestCommand;
+use cretonne_reader::TestCommand;
 use std::borrow::Cow;
 use std::fmt::Write;
 use subtest::{run_filecheck, Context, Result, SubTest};
diff --git a/lib/filetests/src/test_postopt.rs b/lib/filetests/src/test_postopt.rs
index c89fb33ea5..b575a36096 100644
--- a/lib/filetests/src/test_postopt.rs
+++ b/lib/filetests/src/test_postopt.rs
@@ -5,7 +5,7 @@
 use cretonne;
 use cretonne::ir::Function;
 use cretonne::print_errors::pretty_error;
-use cton_reader::TestCommand;
+use cretonne_reader::TestCommand;
 use std::borrow::Cow;
 use std::fmt::Write;
 use subtest::{run_filecheck, Context, Result, SubTest};
diff --git a/lib/filetests/src/test_preopt.rs b/lib/filetests/src/test_preopt.rs
index e2fc9819c9..f58d216a26 100644
--- a/lib/filetests/src/test_preopt.rs
+++ b/lib/filetests/src/test_preopt.rs
@@ -5,7 +5,7 @@
 use cretonne;
 use cretonne::ir::Function;
 use cretonne::print_errors::pretty_error;
-use cton_reader::TestCommand;
+use cretonne_reader::TestCommand;
 use std::borrow::Cow;
 use std::fmt::Write;
 use subtest::{run_filecheck, Context, Result, SubTest};
diff --git a/lib/filetests/src/test_print_cfg.rs b/lib/filetests/src/test_print_cfg.rs
index 7092126cd7..f6388b70fe 100644
--- a/lib/filetests/src/test_print_cfg.rs
+++ b/lib/filetests/src/test_print_cfg.rs
@@ -7,7 +7,7 @@ use std::borrow::Cow;
 
 use cretonne::cfg_printer::CFGPrinter;
 use cretonne::ir::Function;
-use cton_reader::TestCommand;
+use cretonne_reader::TestCommand;
 use subtest::{self, Context, Result as STResult, SubTest};
 
 /// Object implementing the `test print-cfg` sub-test.
diff --git a/lib/filetests/src/test_regalloc.rs b/lib/filetests/src/test_regalloc.rs
index b2ab98c3a4..36f3ac169f 100644
--- a/lib/filetests/src/test_regalloc.rs
+++ b/lib/filetests/src/test_regalloc.rs
@@ -8,7 +8,7 @@
 use cretonne;
 use cretonne::ir::Function;
 use cretonne::print_errors::pretty_error;
-use cton_reader::TestCommand;
+use cretonne_reader::TestCommand;
 use std::borrow::Cow;
 use std::fmt::Write;
 use subtest::{run_filecheck, Context, Result, SubTest};
diff --git a/lib/filetests/src/test_simple_gvn.rs b/lib/filetests/src/test_simple_gvn.rs
index 62f5a2adae..b60379cff1 100644
--- a/lib/filetests/src/test_simple_gvn.rs
+++ b/lib/filetests/src/test_simple_gvn.rs
@@ -8,7 +8,7 @@
 use cretonne;
 use cretonne::ir::Function;
 use cretonne::print_errors::pretty_error;
-use cton_reader::TestCommand;
+use cretonne_reader::TestCommand;
 use std::borrow::Cow;
 use std::fmt::Write;
 use subtest::{run_filecheck, Context, Result, SubTest};
diff --git a/lib/filetests/src/test_verifier.rs b/lib/filetests/src/test_verifier.rs
index a4ec799ee3..0243469630 100644
--- a/lib/filetests/src/test_verifier.rs
+++ b/lib/filetests/src/test_verifier.rs
@@ -11,7 +11,7 @@
 
 use cretonne::ir::Function;
 use cretonne::verify_function;
-use cton_reader::TestCommand;
+use cretonne_reader::TestCommand;
 use match_directive::match_directive;
 use std::borrow::{Borrow, Cow};
 use subtest::{Context, Result, SubTest};
diff --git a/lib/frontend/Cargo.toml b/lib/frontend/Cargo.toml
index 3f35168f75..5dc031926b 100644
--- a/lib/frontend/Cargo.toml
+++ b/lib/frontend/Cargo.toml
@@ -8,9 +8,6 @@ documentation = "https://cretonne.readthedocs.io/"
 repository = "https://github.com/Cretonne/cretonne"
 readme = "README.md"
 
-[lib]
-name = "cton_frontend"
-
 [dependencies]
 cretonne = { path = "../cretonne", version = "0.4.4" }
 
diff --git a/lib/frontend/src/lib.rs b/lib/frontend/src/lib.rs
index 329b6afb50..369a4cf13d 100644
--- a/lib/frontend/src/lib.rs
+++ b/lib/frontend/src/lib.rs
@@ -33,13 +33,13 @@
 //!
 //! ```rust
 //! extern crate cretonne;
-//! extern crate cton_frontend;
+//! extern crate cretonne_frontend;
 //!
 //! use cretonne::entity::EntityRef;
 //! use cretonne::ir::{ExternalName, CallConv, Function, Signature, AbiParam, InstBuilder};
 //! use cretonne::ir::types::*;
 //! use cretonne::settings;
-//! use cton_frontend::{FunctionBuilderContext, FunctionBuilder, Variable};
+//! use cretonne_frontend::{FunctionBuilderContext, FunctionBuilder, Variable};
 //! use cretonne::verifier::verify_function;
 //!
 //! fn main() {
diff --git a/lib/native/Cargo.toml b/lib/native/Cargo.toml
index 4091d5aaa5..3c80e45d15 100644
--- a/lib/native/Cargo.toml
+++ b/lib/native/Cargo.toml
@@ -7,9 +7,6 @@ repository = "https://github.com/Cretonne/cretonne"
 license = "Apache-2.0"
 readme = "README.md"
 
-[lib]
-name = "cton_native"
-
 [dependencies]
 cretonne = { path = "../cretonne", version = "0.4.4" }
 
diff --git a/lib/reader/Cargo.toml b/lib/reader/Cargo.toml
index 16f097bccc..d3a5213cdd 100644
--- a/lib/reader/Cargo.toml
+++ b/lib/reader/Cargo.toml
@@ -8,9 +8,6 @@ documentation = "https://cretonne.readthedocs.io/"
 repository = "https://github.com/Cretonne/cretonne"
 readme = "README.md"
 
-[lib]
-name = "cton_reader"
-
 [dependencies]
 cretonne = { path = "../cretonne", version = "0.4.4" }
 
diff --git a/lib/reader/src/lib.rs b/lib/reader/src/lib.rs
index e012876c1c..8b4b831042 100644
--- a/lib/reader/src/lib.rs
+++ b/lib/reader/src/lib.rs
@@ -1,7 +1,7 @@
 //! Cretonne file reader library.
 //!
-//! The `cton_reader` library supports reading .cton files. This functionality is needed for testing
-//! Cretonne, but is not essential for a JIT compiler.
+//! The `cretonne_reader` library supports reading .cton files. This functionality is needed for
+//! testing Cretonne, but is not essential for a JIT compiler.
 
 #![deny(missing_docs, trivial_numeric_casts, unused_extern_crates)]
 
diff --git a/lib/wasm/Cargo.toml b/lib/wasm/Cargo.toml
index 16af0765ac..f9c60e7c92 100644
--- a/lib/wasm/Cargo.toml
+++ b/lib/wasm/Cargo.toml
@@ -8,9 +8,6 @@ license = "Apache-2.0"
 readme = "README.md"
 keywords = ["webassembly", "wasm"]
 
-[lib]
-name = "cton_wasm"
-
 [dependencies]
 wasmparser = "0.15.1"
 cretonne = { path = "../cretonne", version = "0.4.4" }
diff --git a/lib/wasm/src/code_translator.rs b/lib/wasm/src/code_translator.rs
index 9dbace8556..945cedc1de 100644
--- a/lib/wasm/src/code_translator.rs
+++ b/lib/wasm/src/code_translator.rs
@@ -26,7 +26,7 @@ use cretonne::ir::condcodes::{FloatCC, IntCC};
 use cretonne::ir::types::*;
 use cretonne::ir::{self, InstBuilder, JumpTableData, MemFlags};
 use cretonne::packed_option::ReservedValue;
-use cton_frontend::{FunctionBuilder, Variable};
+use cretonne_frontend::{FunctionBuilder, Variable};
 use environ::{FuncEnvironment, GlobalValue};
 use state::{ControlStackFrame, TranslationState};
 use std::collections::{hash_map, HashMap};
diff --git a/lib/wasm/src/func_translator.rs b/lib/wasm/src/func_translator.rs
index c89fa21266..537aeed0c2 100644
--- a/lib/wasm/src/func_translator.rs
+++ b/lib/wasm/src/func_translator.rs
@@ -9,7 +9,7 @@ use cretonne::entity::EntityRef;
 use cretonne::ir::{self, Ebb, InstBuilder};
 use cretonne::result::{CtonError, CtonResult};
 use cretonne::timing;
-use cton_frontend::{FunctionBuilder, FunctionBuilderContext, Variable};
+use cretonne_frontend::{FunctionBuilder, FunctionBuilderContext, Variable};
 use environ::FuncEnvironment;
 use state::TranslationState;
 use wasmparser::{self, BinaryReader};
diff --git a/lib/wasm/src/lib.rs b/lib/wasm/src/lib.rs
index 6ed76be8e3..197d228eab 100644
--- a/lib/wasm/src/lib.rs
+++ b/lib/wasm/src/lib.rs
@@ -15,7 +15,7 @@
 
 #[macro_use(dbg)]
 extern crate cretonne;
-extern crate cton_frontend;
+extern crate cretonne_frontend;
 extern crate wasmparser;
 
 mod code_translator;
diff --git a/lib/wasm/tests/wasm_testsuite.rs b/lib/wasm/tests/wasm_testsuite.rs
index 273818f470..fac93e6012 100644
--- a/lib/wasm/tests/wasm_testsuite.rs
+++ b/lib/wasm/tests/wasm_testsuite.rs
@@ -1,11 +1,11 @@
 extern crate cretonne;
-extern crate cton_wasm;
+extern crate cretonne_wasm;
 extern crate tempdir;
 
 use cretonne::print_errors::pretty_verifier_error;
 use cretonne::settings::{self, Configurable, Flags};
 use cretonne::verifier;
-use cton_wasm::{translate_module, DummyEnvironment};
+use cretonne_wasm::{translate_module, DummyEnvironment};
 use std::error::Error;
 use std::fs;
 use std::fs::File;