diff --git a/cranelift/Cargo.toml b/cranelift/Cargo.toml
index 6dabfb52c1..96073ab469 100644
--- a/cranelift/Cargo.toml
+++ b/cranelift/Cargo.toml
@@ -5,7 +5,7 @@ version = "0.59.0"
 description = "Binaries for testing the Cranelift libraries"
 license = "Apache-2.0 WITH LLVM-exception"
 documentation = "https://github.com/bytecodealliance/wasmtime/blob/master/cranelift/docs/index.md"
-repository = "https://github.com/bytecodealliance/cranelift"
+repository = "https://github.com/bytecodealliance/wasmtime"
 publish = false
 edition = "2018"
 
diff --git a/cranelift/README.md b/cranelift/README.md
index 565e55a6b9..ce4dec78e6 100644
--- a/cranelift/README.md
+++ b/cranelift/README.md
@@ -8,7 +8,7 @@ Cranelift is a low-level retargetable code generator. It translates a
 into executable machine code.
 
 [BA]: https://bytecodealliance.org/
-[![Build Status](https://github.com/bytecodealliance/cranelift/workflows/CI/badge.svg)](https://github.com/bytecodealliance/cranelift/actions)
+[![Build Status](https://github.com/bytecodealliance/wasmtime/workflows/CI/badge.svg)](https://github.com/bytecodealliance/wasmtime/actions)
 [![Fuzzit Status](https://app.fuzzit.dev/badge?org_id=bytecodealliance)](https://app.fuzzit.dev/orgs/bytecodealliance/dashboard)
 [![Chat](https://img.shields.io/badge/chat-zulip-brightgreen.svg)](https://bytecodealliance.zulipchat.com/#narrow/stream/217117-cranelift/topic/general)
 ![Minimum rustc 1.37](https://img.shields.io/badge/rustc-1.37+-green.svg)
diff --git a/cranelift/bforest/Cargo.toml b/cranelift/bforest/Cargo.toml
index fdb28780be..7430b423c5 100644
--- a/cranelift/bforest/Cargo.toml
+++ b/cranelift/bforest/Cargo.toml
@@ -5,7 +5,7 @@ version = "0.59.0"
 description = "A forest of B+-trees"
 license = "Apache-2.0 WITH LLVM-exception"
 documentation = "https://docs.rs/cranelift-bforest"
-repository = "https://github.com/bytecodealliance/cranelift"
+repository = "https://github.com/bytecodealliance/wasmtime"
 categories = ["no-std"]
 readme = "README.md"
 keywords = ["btree", "forest", "set", "map"]
@@ -16,4 +16,3 @@ cranelift-entity = { path = "../entity", version = "0.59.0", default-features =
 
 [badges]
 maintenance = { status = "experimental" }
-travis-ci = { repository = "bytecodealliance/cranelift" }
diff --git a/cranelift/codegen/Cargo.toml b/cranelift/codegen/Cargo.toml
index cdf07fb425..44b135df53 100644
--- a/cranelift/codegen/Cargo.toml
+++ b/cranelift/codegen/Cargo.toml
@@ -5,7 +5,7 @@ version = "0.59.0"
 description = "Low-level code generator library"
 license = "Apache-2.0 WITH LLVM-exception"
 documentation = "https://docs.rs/cranelift-codegen"
-repository = "https://github.com/bytecodealliance/cranelift"
+repository = "https://github.com/bytecodealliance/wasmtime"
 categories = ["no-std"]
 readme = "README.md"
 keywords = ["compile", "compiler", "jit"]
@@ -71,4 +71,3 @@ enable-serde = ["serde"]
 
 [badges]
 maintenance = { status = "experimental" }
-travis-ci = { repository = "bytecodealliance/cranelift" }
diff --git a/cranelift/codegen/meta/Cargo.toml b/cranelift/codegen/meta/Cargo.toml
index cc60048144..246176d488 100644
--- a/cranelift/codegen/meta/Cargo.toml
+++ b/cranelift/codegen/meta/Cargo.toml
@@ -4,7 +4,7 @@ authors = ["The Cranelift Project Developers"]
 version = "0.59.0"
 description = "Metaprogram for cranelift-codegen code generator library"
 license = "Apache-2.0 WITH LLVM-exception"
-repository = "https://github.com/bytecodealliance/cranelift"
+repository = "https://github.com/bytecodealliance/wasmtime"
 readme = "README.md"
 edition = "2018"
 
@@ -14,7 +14,6 @@ cranelift-entity = { path = "../../entity", version = "0.59.0" }
 
 [badges]
 maintenance = { status = "experimental" }
-travis-ci = { repository = "bytecodealliance/cranelift" }
 
 [package.metadata.docs.rs]
 rustdoc-args = [ "--document-private-items" ]
diff --git a/cranelift/codegen/meta/src/isa/x86/encodings.rs b/cranelift/codegen/meta/src/isa/x86/encodings.rs
index f55083299e..0f2a96cc93 100644
--- a/cranelift/codegen/meta/src/isa/x86/encodings.rs
+++ b/cranelift/codegen/meta/src/isa/x86/encodings.rs
@@ -1825,7 +1825,7 @@ fn define_simd(
 
     // SIMD register movement: store, load, spill, fill, regmove. All of these use encodings of
     // MOVUPS and MOVAPS from SSE (TODO ideally all of these would either use MOVAPS when we have
-    // alignment or type-specific encodings, see https://github.com/bytecodealliance/cranelift/issues/1039).
+    // alignment or type-specific encodings, see https://github.com/bytecodealliance/wasmtime/issues/1124).
     for ty in ValueType::all_lane_types().filter(allowed_simd_type) {
         // Store
         let bound_store = store.bind(vector(ty, sse_vector_size)).bind(Any);
@@ -1974,7 +1974,7 @@ fn define_simd(
     // allows SIMD shifts to be legalized more easily. TODO ideally this would be typed as an
     // I128x1 but restrictions on the type builder prevent this; the general idea here is that
     // the upper bits are all zeroed and do not form parts of any separate lane. See
-    // https://github.com/bytecodealliance/cranelift/issues/1146.
+    // https://github.com/bytecodealliance/wasmtime/issues/1140.
     e.enc_both(
         bitcast.bind(vector(I64, sse_vector_size)).bind(I32),
         rec_frurm.opcodes(&MOVD_LOAD_XMM),
diff --git a/cranelift/codegen/shared/Cargo.toml b/cranelift/codegen/shared/Cargo.toml
index 42207d427a..da480296ab 100644
--- a/cranelift/codegen/shared/Cargo.toml
+++ b/cranelift/codegen/shared/Cargo.toml
@@ -4,7 +4,7 @@ name = "cranelift-codegen-shared"
 version = "0.59.0"
 description = "For code shared between cranelift-codegen-meta and cranelift-codegen"
 license = "Apache-2.0 WITH LLVM-exception"
-repository = "https://github.com/bytecodealliance/cranelift"
+repository = "https://github.com/bytecodealliance/wasmtime"
 readme = "README.md"
 edition = "2018"
 
diff --git a/cranelift/entity/Cargo.toml b/cranelift/entity/Cargo.toml
index 9428da0f38..7b29816b0c 100644
--- a/cranelift/entity/Cargo.toml
+++ b/cranelift/entity/Cargo.toml
@@ -5,7 +5,7 @@ version = "0.59.0"
 description = "Data structures using entity references as mapping keys"
 license = "Apache-2.0 WITH LLVM-exception"
 documentation = "https://docs.rs/cranelift-entity"
-repository = "https://github.com/bytecodealliance/cranelift"
+repository = "https://github.com/bytecodealliance/wasmtime"
 categories = ["no-std"]
 readme = "README.md"
 keywords = ["entity", "set", "map"]
@@ -19,4 +19,3 @@ enable-serde = ["serde"]
 
 [badges]
 maintenance = { status = "experimental" }
-travis-ci = { repository = "bytecodealliance/cranelift" }
diff --git a/cranelift/faerie/Cargo.toml b/cranelift/faerie/Cargo.toml
index 66deae3ba1..dc5d80e70a 100644
--- a/cranelift/faerie/Cargo.toml
+++ b/cranelift/faerie/Cargo.toml
@@ -3,7 +3,7 @@ name = "cranelift-faerie"
 version = "0.59.0"
 authors = ["The Cranelift Project Developers"]
 description = "Emit Cranelift output to native object files with Faerie"
-repository = "https://github.com/bytecodealliance/cranelift"
+repository = "https://github.com/bytecodealliance/wasmtime"
 documentation = "https://docs.rs/cranelift-faerie"
 license = "Apache-2.0 WITH LLVM-exception"
 readme = "README.md"
@@ -24,4 +24,3 @@ features = ["std"]
 
 [badges]
 maintenance = { status = "experimental" }
-travis-ci = { repository = "bytecodealliance/cranelift" }
diff --git a/cranelift/filetests/Cargo.toml b/cranelift/filetests/Cargo.toml
index a5b34f7cb5..971575d7ba 100644
--- a/cranelift/filetests/Cargo.toml
+++ b/cranelift/filetests/Cargo.toml
@@ -5,7 +5,7 @@ version = "0.59.0"
 description = "Test driver and implementations of the filetest commands"
 license = "Apache-2.0 WITH LLVM-exception"
 documentation = "https://docs.rs/cranelift-filetests"
-repository = "https://github.com/bytecodealliance/cranelift"
+repository = "https://github.com/bytecodealliance/wasmtime"
 publish = false
 edition = "2018"
 
diff --git a/cranelift/frontend/Cargo.toml b/cranelift/frontend/Cargo.toml
index 111a03cbf8..20d454c965 100644
--- a/cranelift/frontend/Cargo.toml
+++ b/cranelift/frontend/Cargo.toml
@@ -6,7 +6,7 @@ description = "Cranelift IR builder helper"
 license = "Apache-2.0 WITH LLVM-exception"
 documentation = "https://docs.rs/cranelift-frontend"
 categories = ["no-std"]
-repository = "https://github.com/bytecodealliance/cranelift"
+repository = "https://github.com/bytecodealliance/wasmtime"
 readme = "README.md"
 edition = "2018"
 
@@ -24,4 +24,3 @@ core = ["hashbrown", "cranelift-codegen/core"]
 
 [badges]
 maintenance = { status = "experimental" }
-travis-ci = { repository = "bytecodealliance/cranelift" }
diff --git a/cranelift/module/Cargo.toml b/cranelift/module/Cargo.toml
index 7a422f7394..765179c649 100644
--- a/cranelift/module/Cargo.toml
+++ b/cranelift/module/Cargo.toml
@@ -3,7 +3,7 @@ name = "cranelift-module"
 version = "0.59.0"
 authors = ["The Cranelift Project Developers"]
 description = "Support for linking functions and data with Cranelift"
-repository = "https://github.com/bytecodealliance/cranelift"
+repository = "https://github.com/bytecodealliance/wasmtime"
 documentation = "https://docs.rs/cranelift-module"
 categories = ["no-std"]
 license = "Apache-2.0 WITH LLVM-exception"
@@ -24,4 +24,3 @@ core = ["hashbrown", "cranelift-codegen/core"]
 
 [badges]
 maintenance = { status = "experimental" }
-travis-ci = { repository = "bytecodealliance/cranelift" }
diff --git a/cranelift/native/Cargo.toml b/cranelift/native/Cargo.toml
index ae571edffe..e4cdf461cf 100644
--- a/cranelift/native/Cargo.toml
+++ b/cranelift/native/Cargo.toml
@@ -3,7 +3,7 @@ name = "cranelift-native"
 version = "0.59.0"
 authors = ["The Cranelift Project Developers"]
 description = "Support for targeting the host with Cranelift"
-repository = "https://github.com/bytecodealliance/cranelift"
+repository = "https://github.com/bytecodealliance/wasmtime"
 categories = ["no-std"]
 license = "Apache-2.0 WITH LLVM-exception"
 readme = "README.md"
@@ -26,4 +26,3 @@ core = ["cranelift-codegen/core", "raw-cpuid/nightly"]
 
 [badges]
 maintenance = { status = "experimental" }
-travis-ci = { repository = "bytecodealliance/cranelift" }
diff --git a/cranelift/object/Cargo.toml b/cranelift/object/Cargo.toml
index ec6820ed8b..7ba5788994 100644
--- a/cranelift/object/Cargo.toml
+++ b/cranelift/object/Cargo.toml
@@ -3,7 +3,7 @@ name = "cranelift-object"
 version = "0.59.0"
 authors = ["The Cranelift Project Developers"]
 description = "Emit Cranelift output to native object files with `object`"
-repository = "https://github.com/bytecodealliance/cranelift"
+repository = "https://github.com/bytecodealliance/wasmtime"
 documentation = "https://docs.rs/cranelift-object"
 license = "Apache-2.0 WITH LLVM-exception"
 readme = "README.md"
@@ -23,4 +23,3 @@ features = ["std"]
 
 [badges]
 maintenance = { status = "experimental" }
-travis-ci = { repository = "bytecodealliance/cranelift" }
diff --git a/cranelift/preopt/Cargo.toml b/cranelift/preopt/Cargo.toml
index 6204d1d67c..82c0c1e4de 100644
--- a/cranelift/preopt/Cargo.toml
+++ b/cranelift/preopt/Cargo.toml
@@ -5,7 +5,7 @@ version = "0.59.0"
 description = "Support for optimizations in Cranelift"
 license = "Apache-2.0 WITH LLVM-exception"
 documentation = "https://docs.rs/cranelift-preopt"
-repository = "https://github.com/bytecodealliance/cranelift"
+repository = "https://github.com/bytecodealliance/wasmtime"
 categories = ["no-std"]
 readme = "README.md"
 keywords = ["optimize", "compile", "compiler", "jit"]
@@ -25,4 +25,3 @@ core = ["cranelift-codegen/core"]
 
 [badges]
 maintenance = { status = "experimental" }
-travis-ci = { repository = "bytecodealliance/cranelift" }
diff --git a/cranelift/reader/Cargo.toml b/cranelift/reader/Cargo.toml
index ce18bb4872..8a782ebf18 100644
--- a/cranelift/reader/Cargo.toml
+++ b/cranelift/reader/Cargo.toml
@@ -5,7 +5,7 @@ version = "0.59.0"
 description = "Cranelift textual IR reader"
 license = "Apache-2.0 WITH LLVM-exception"
 documentation = "https://docs.rs/cranelift-reader"
-repository = "https://github.com/bytecodealliance/cranelift"
+repository = "https://github.com/bytecodealliance/wasmtime"
 readme = "README.md"
 edition = "2018"
 
@@ -15,4 +15,3 @@ target-lexicon = "0.10"
 
 [badges]
 maintenance = { status = "experimental" }
-travis-ci = { repository = "bytecodealliance/cranelift" }
diff --git a/cranelift/rustc.md b/cranelift/rustc.md
index a887ca5b80..863e797c9e 100644
--- a/cranelift/rustc.md
+++ b/cranelift/rustc.md
@@ -22,7 +22,7 @@ There's plenty of work to do to achieve these goals, and if we achieve
 them, we'll have enabled a Rust compiler written entirely in Rust, and
 enabled faster Rust compile times for important use cases.
 
-See [issues tagged "rustc"](https://github.com/bytecodealliance/cranelift/labels/goal%3Arustc)
+See [issues tagged "rustc"](https://github.com/bytecodealliance/wasmtime/labels/cranelift%3Agoal%3Arustc)
 for a list of some of the things that will be needed.
 
 With all that said, there is a potential goal beyond that, which is to
diff --git a/cranelift/serde/Cargo.toml b/cranelift/serde/Cargo.toml
index 6ab2ae0045..56625e0c37 100644
--- a/cranelift/serde/Cargo.toml
+++ b/cranelift/serde/Cargo.toml
@@ -3,7 +3,7 @@ name = "cranelift-serde"
 version = "0.59.0"
 authors = ["The Cranelift Project Developers"]
 description = "Serializer/Deserializer for Cranelift IR"
-repository = "https://github.com/bytecodealliance/cranelift"
+repository = "https://github.com/bytecodealliance/wasmtime"
 license = "Apache-2.0 WITH LLVM-exception"
 readme = "README.md"
 keywords = ["webassembly", "serde"]
@@ -23,4 +23,3 @@ cranelift-reader = { path = "../reader", version = "0.59.0" }
 
 [badges]
 maintenance = { status = "experimental" }
-travis-ci = { repository = "bytecodealliance/cranelift" }
diff --git a/cranelift/simplejit/Cargo.toml b/cranelift/simplejit/Cargo.toml
index fc4bf329dd..1a781b851a 100644
--- a/cranelift/simplejit/Cargo.toml
+++ b/cranelift/simplejit/Cargo.toml
@@ -3,7 +3,7 @@ name = "cranelift-simplejit"
 version = "0.59.0"
 authors = ["The Cranelift Project Developers"]
 description = "A simple JIT library backed by Cranelift"
-repository = "https://github.com/bytecodealliance/cranelift"
+repository = "https://github.com/bytecodealliance/wasmtime"
 documentation = "https://docs.rs/cranelift-simplejit"
 license = "Apache-2.0 WITH LLVM-exception"
 readme = "README.md"
@@ -38,4 +38,3 @@ cranelift-entity = { path = "../entity", version = "0.59.0" }
 
 [badges]
 maintenance = { status = "experimental" }
-travis-ci = { repository = "bytecodealliance/cranelift" }
diff --git a/cranelift/simplejit/README.md b/cranelift/simplejit/README.md
index d4f393cb31..4f0fe3d4e0 100644
--- a/cranelift/simplejit/README.md
+++ b/cranelift/simplejit/README.md
@@ -5,4 +5,4 @@ This crate is extremely experimental.
 
 See the [example program] for a brief overview of how to use this.
 
-[example program]: https://github.com/bytecodealliance/cranelift/tree/master/cranelift-simplejit/examples/simplejit-minimal.rs
+[example program]: https://github.com/bytecodealliance/wasmtime/blob/master/cranelift/simplejit/examples/simplejit-minimal.rs
diff --git a/cranelift/umbrella/Cargo.toml b/cranelift/umbrella/Cargo.toml
index 8260fcb935..428f5800b5 100644
--- a/cranelift/umbrella/Cargo.toml
+++ b/cranelift/umbrella/Cargo.toml
@@ -5,7 +5,7 @@ version = "0.59.0"
 description = "Umbrella for commonly-used cranelift crates"
 license = "Apache-2.0 WITH LLVM-exception"
 documentation = "https://docs.rs/cranelift"
-repository = "https://github.com/bytecodealliance/cranelift"
+repository = "https://github.com/bytecodealliance/wasmtime"
 categories = ["no-std"]
 readme = "README.md"
 keywords = ["compile", "compiler", "jit"]
@@ -22,4 +22,3 @@ core = ["cranelift-codegen/core", "cranelift-frontend/core"]
 
 [badges]
 maintenance = { status = "experimental" }
-travis-ci = { repository = "bytecodealliance/cranelift" }
diff --git a/cranelift/wasm/Cargo.toml b/cranelift/wasm/Cargo.toml
index bc5bb83f7b..e463a2048c 100644
--- a/cranelift/wasm/Cargo.toml
+++ b/cranelift/wasm/Cargo.toml
@@ -3,7 +3,7 @@ name = "cranelift-wasm"
 version = "0.59.0"
 authors = ["The Cranelift Project Developers"]
 description = "Translator from WebAssembly to Cranelift IR"
-repository = "https://github.com/bytecodealliance/cranelift"
+repository = "https://github.com/bytecodealliance/wasmtime"
 license = "Apache-2.0 WITH LLVM-exception"
 categories = ["no-std", "wasm"]
 readme = "README.md"
@@ -32,4 +32,3 @@ enable-serde = ["serde"]
 
 [badges]
 maintenance = { status = "experimental" }
-travis-ci = { repository = "bytecodealliance/cranelift" }
diff --git a/cranelift/wasm/src/code_translator.rs b/cranelift/wasm/src/code_translator.rs
index 3cc15ea627..4e64b539e8 100644
--- a/cranelift/wasm/src/code_translator.rs
+++ b/cranelift/wasm/src/code_translator.rs
@@ -1206,7 +1206,7 @@ pub fn translate_operator<FE: FuncEnvironment + ?Sized>(
         } => {
             // TODO: For spec compliance, this is initially implemented as a combination of `load +
             // splat` but could be implemented eventually as a single instruction (`load_splat`).
-            // See https://github.com/bytecodealliance/cranelift/issues/1348.
+            // See https://github.com/bytecodealliance/wasmtime/issues/1175.
             translate_load(
                 *offset,
                 ir::Opcode::Load,
diff --git a/docs/contributing.md b/docs/contributing.md
index 427b0c7b78..07ad9d4b4f 100644
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -57,14 +57,14 @@ though not necessarily Cranelift-specific or even compiler-specific
 experience. [E-compiler-easy] marks issues good for beginners who have
 some familiarity with compilers, or are interested in gaining some :-).
 
-See also the [full list of labels].
+See also the [full list of Cranelift labels].
 
 Also, we encourage people to just look around and find things they're
 interested in. This a good time to get involved, as there aren't a lot of
 things set in stone yet.
 
 [Rust's issue tags]: https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md#issue-triage
-[E-easy]: https://github.com/bytecodealliance/cranelift/labels/E-easy
-[E-rust]: https://github.com/bytecodealliance/cranelift/labels/E-rust
-[E-compiler-easy]: https://github.com/bytecodealliance/cranelift/labels/E-compiler-easy
-[full list of labels]: https://github.com/bytecodealliance/cranelift/labels
+[E-easy]: https://github.com/bytecodealliance/wasmtime/labels/cranelift%3AE-easy
+[E-rust]: https://github.com/bytecodealliance/wasmtime/labels/cranelift%3AE-rust
+[E-compiler-easy]: https://github.com/bytecodealliance/wasmtime/labels/cranelift%3AE-compiler-easy
+[full list of Cranelift labels]: https://github.com/bytecodealliance/wasmtime/labels?q=cranelift
diff --git a/tests/wast_testsuites.rs b/tests/wast_testsuites.rs
index 9ff7107205..8bfa5ee353 100644
--- a/tests/wast_testsuites.rs
+++ b/tests/wast_testsuites.rs
@@ -28,7 +28,7 @@ fn run_wast(wast: &str, strategy: Strategy) -> anyhow::Result<()> {
         .strategy(strategy)?
         .cranelift_debug_verifier(true);
 
-    // FIXME: https://github.com/bytecodealliance/cranelift/issues/1409
+    // FIXME: https://github.com/bytecodealliance/wasmtime/issues/1186
     if simd {
         cfg.cranelift_opt_level(OptLevel::None);
     }