diff --git a/cranelift/docs/testing.rst b/cranelift/docs/testing.rst
index 951149c044..2b84b1c19b 100644
--- a/cranelift/docs/testing.rst
+++ b/cranelift/docs/testing.rst
@@ -119,7 +119,7 @@ All types of tests allow shared Cretonne settings to be modified:
     option        : flag | setting "=" value
 
 The shared settings available for all target ISAs are defined in
-:file:`lib/cretonne/meta/cretonne/settings.py`.
+:file:`lib/cretonne/meta/base/settings.py`.
 
 The ``set`` lines apply settings cumulatively::
 
diff --git a/lib/cretonne/src/isa/arm32/settings.rs b/lib/cretonne/src/isa/arm32/settings.rs
index e857716a64..b502deee40 100644
--- a/lib/cretonne/src/isa/arm32/settings.rs
+++ b/lib/cretonne/src/isa/arm32/settings.rs
@@ -5,5 +5,5 @@ use std::fmt;
 
 // Include code generated by `lib/cretonne/meta/gen_settings.py`. This file contains a public
 // `Flags` struct with an impl for all of the settings defined in
-// `lib/cretonne/meta/cretonne/settings.py`.
+// `lib/cretonne/meta/isa/arm32/settings.py`.
 include!(concat!(env!("OUT_DIR"), "/settings-arm32.rs"));
diff --git a/lib/cretonne/src/isa/arm64/settings.rs b/lib/cretonne/src/isa/arm64/settings.rs
index 6427d7be99..b575168361 100644
--- a/lib/cretonne/src/isa/arm64/settings.rs
+++ b/lib/cretonne/src/isa/arm64/settings.rs
@@ -5,5 +5,5 @@ use std::fmt;
 
 // Include code generated by `lib/cretonne/meta/gen_settings.py`. This file contains a public
 // `Flags` struct with an impl for all of the settings defined in
-// `lib/cretonne/meta/cretonne/settings.py`.
+// `lib/cretonne/meta/isa/arm64/settings.py`.
 include!(concat!(env!("OUT_DIR"), "/settings-arm64.rs"));
diff --git a/lib/cretonne/src/isa/intel/settings.rs b/lib/cretonne/src/isa/intel/settings.rs
index f933e91b87..147af4c2fa 100644
--- a/lib/cretonne/src/isa/intel/settings.rs
+++ b/lib/cretonne/src/isa/intel/settings.rs
@@ -5,7 +5,7 @@ use std::fmt;
 
 // Include code generated by `lib/cretonne/meta/gen_settings.py`. This file contains a public
 // `Flags` struct with an impl for all of the settings defined in
-// `lib/cretonne/meta/cretonne/settings.py`.
+// `lib/cretonne/meta/isa/intel/settings.py`.
 include!(concat!(env!("OUT_DIR"), "/settings-intel.rs"));
 
 #[cfg(test)]
diff --git a/lib/cretonne/src/isa/riscv/settings.rs b/lib/cretonne/src/isa/riscv/settings.rs
index 8cb376e5da..2aa78fa853 100644
--- a/lib/cretonne/src/isa/riscv/settings.rs
+++ b/lib/cretonne/src/isa/riscv/settings.rs
@@ -5,7 +5,7 @@ use std::fmt;
 
 // Include code generated by `lib/cretonne/meta/gen_settings.py`. This file contains a public
 // `Flags` struct with an impl for all of the settings defined in
-// `lib/cretonne/meta/cretonne/settings.py`.
+// `lib/cretonne/meta/isa/riscv/settings.py`.
 include!(concat!(env!("OUT_DIR"), "/settings-riscv.rs"));
 
 #[cfg(test)]
diff --git a/lib/cretonne/src/legalizer/mod.rs b/lib/cretonne/src/legalizer/mod.rs
index 81dde2f457..189a3e735d 100644
--- a/lib/cretonne/src/legalizer/mod.rs
+++ b/lib/cretonne/src/legalizer/mod.rs
@@ -107,7 +107,7 @@ pub fn legalize_function(func: &mut ir::Function, cfg: &mut ControlFlowGraph, is
 }
 
 // Include legalization patterns that were generated by `gen_legalizer.py` from the `XForms` in
-// `meta/cretonne/legalize.py`.
+// `lib/cretonne/meta/base/legalize.py`.
 //
 // Concretely, this defines private functions `narrow()`, and `expand()`.
 include!(concat!(env!("OUT_DIR"), "/legalizer.rs"));
diff --git a/lib/cretonne/src/predicates.rs b/lib/cretonne/src/predicates.rs
index 6ce3e0a799..63d2e79af3 100644
--- a/lib/cretonne/src/predicates.rs
+++ b/lib/cretonne/src/predicates.rs
@@ -1,7 +1,7 @@
 //! Predicate functions for testing instruction fields.
 //!
 //! This module defines functions that are used by the instruction predicates defined by
-//! `lib/cretonne/meta/cretonne/predicates.py` classes.
+//! `lib/cretonne/meta/cdsl/predicates.py` classes.
 //!
 //! The predicates the operate on integer fields use `Into<i64>` as a shared trait bound. This
 //! bound is implemented by all the native integer types as well as `Imm64`.
diff --git a/lib/cretonne/src/settings.rs b/lib/cretonne/src/settings.rs
index 36a48e04b4..a87ceda695 100644
--- a/lib/cretonne/src/settings.rs
+++ b/lib/cretonne/src/settings.rs
@@ -311,7 +311,7 @@ pub mod detail {
 }
 
 // Include code generated by `meta/gen_settings.py`. This file contains a public `Flags` struct
-// with an impl for all of the settings defined in `meta/cretonne/settings.py`.
+// with an impl for all of the settings defined in `lib/cretonne/meta/base/settings.py`.
 include!(concat!(env!("OUT_DIR"), "/settings.rs"));
 
 /// Wrapper containing flags and optionally a `TargetIsa` trait object.