diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index f9587eab..ff61f25e 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,6 +1,6 @@
 contact_links:
   - name: Discussions
-    url: https://github.com/simolus3/moor/discussions
+    url: https://github.com/simolus3/drift/discussions
     about: "For questions on how to use drift and moor, prefer a Q&A discussion over issues"
   - name: Gitter community
     url: https://gitter.im/moor-dart/community
diff --git a/README.md b/README.md
index 77ac4568..7c541e41 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 _Note: Moor has been renamed to drift_
 
-[![Build Status](https://api.cirrus-ci.com/github/simolus3/moor.svg)](https://github.com/simolus3/moor/actions/workflows/main.yml/badge.svg)
+[![Build Status](https://api.cirrus-ci.com/github/simolus3/moor.svg)](https://github.com/simolus3/drift/actions/workflows/main.yml/badge.svg)
 [![Chat on Gitter](https://img.shields.io/gitter/room/moor-dart/community)](https://gitter.im/moor-dart/community)
 
 ## Proudly Sponsored by [Stream 💙](https://getstream.io/chat/flutter/tutorial/?utm_source=Github&utm_medium=Github_Repo_Content_Ad&utm_content=Developer&utm_campaign=Github_Jan2022_FlutterChat&utm_term=moor)
@@ -49,8 +49,8 @@ With drift, persistence on Flutter is fun!
 __To start using drift, read our detailed [docs](https://drift.simonbinder.eu/docs/getting-started/).__
 
 If you have any questions, feedback or ideas, feel free to [create an
-issue](https://github.com/simolus3/moor/issues/new). If you enjoy this
-project, I'd appreciate your [🌟 on GitHub](https://github.com/simolus3/moor/).
+issue](https://github.com/simolus3/drift/issues/new). If you enjoy this
+project, I'd appreciate your [🌟 on GitHub](https://github.com/simolus3/drift/).
 
 -----
 
diff --git a/docs/pages/docs/Advanced Features/builder_options.md b/docs/pages/docs/Advanced Features/builder_options.md
index 5b2a2d92..d83a1fd8 100644
--- a/docs/pages/docs/Advanced Features/builder_options.md	
+++ b/docs/pages/docs/Advanced Features/builder_options.md	
@@ -200,7 +200,7 @@ targets:
 In all files that use generated drift code, you'll have to replace `part 'filename.g.dart'` with `part 'filename.drift.dart'`.
 If you use drift _and_ another builder in the same file, you'll need both `.g.dart` and `.drift.dart` as part-files.
 
-A full example is available as part of [the drift repo](https://github.com/simolus3/moor/tree/develop/extras/with_built_value).
+A full example is available as part of [the drift repo](https://github.com/simolus3/drift/tree/develop/extras/with_built_value).
 
 If you run into any problems with this approach, feel free to open an issue on drift.
 
diff --git a/docs/pages/docs/Advanced Features/custom_row_classes.md b/docs/pages/docs/Advanced Features/custom_row_classes.md
index b97f707f..f4adf426 100644
--- a/docs/pages/docs/Advanced Features/custom_row_classes.md	
+++ b/docs/pages/docs/Advanced Features/custom_row_classes.md	
@@ -131,7 +131,7 @@ In some advanced use-cases, custom classes can be a better alternative though:
 
 ## Limitations
 
-These restrictions will be gradually lifted in upcoming drift versions. Follow [#1134](https://github.com/simolus3/moor/issues/1134) for details.
+These restrictions will be gradually lifted in upcoming drift versions. Follow [#1134](https://github.com/simolus3/drift/issues/1134) for details.
 
 For now, this feature is subject to the following limitations:
 
diff --git a/docs/pages/docs/Advanced Features/isolates.md b/docs/pages/docs/Advanced Features/isolates.md
index 5755a2ce..d055a5be 100644
--- a/docs/pages/docs/Advanced Features/isolates.md	
+++ b/docs/pages/docs/Advanced Features/isolates.md	
@@ -269,4 +269,4 @@ that complicate this setup. Further, the `IsolateNameServer` is not cleared on a
 the isolates are stopped and registered ports become invalid.
 There is no reliable way to check if a `SendPort` is bound to an active `ReceivePort` or not.
 
-Possible implementations of this pattern and associated problems are described in [this issue](https://github.com/simolus3/moor/issues/567#issuecomment-934514380).
+Possible implementations of this pattern and associated problems are described in [this issue](https://github.com/simolus3/drift/issues/567#issuecomment-934514380).
diff --git a/docs/pages/docs/Advanced Features/migrations.md b/docs/pages/docs/Advanced Features/migrations.md
index 72068478..35846887 100644
--- a/docs/pages/docs/Advanced Features/migrations.md	
+++ b/docs/pages/docs/Advanced Features/migrations.md	
@@ -232,7 +232,7 @@ yet. You can just delete your apps' data and reinstall the app - the database wi
 will be created again. Please note that uninstalling is not enough sometimes - Android might have backed up
 the database file and will re-create it when installing the app again.
 
-You can also delete and re-create all tables every time your app is opened, see [this comment](https://github.com/simolus3/moor/issues/188#issuecomment-542682912)
+You can also delete and re-create all tables every time your app is opened, see [this comment](https://github.com/simolus3/drift/issues/188#issuecomment-542682912)
 on how that can be achieved.
 
 ## Verifying migrations
@@ -248,8 +248,8 @@ By using those test databases, drift can help you test migrations from and to an
 
 {% block "blocks/alert" title="Complex topic ahead" %}
 > Writing schema tests is an advanced topic that requires a fairly complex setup described here.
-  If you get stuck along the way, don't hesitate to [open a discussion about it](https://github.com/simolus3/moor/discussions).
-  Also, there's a working example [in the drift repository](https://github.com/simolus3/moor/tree/latest-release/extras/migrations_example).
+  If you get stuck along the way, don't hesitate to [open a discussion about it](https://github.com/simolus3/drift/discussions).
+  Also, there's a working example [in the drift repository](https://github.com/simolus3/drift/tree/latest-release/extras/migrations_example).
 {% endblock %}
 
 ### Setup
diff --git a/docs/pages/docs/Examples/index.md b/docs/pages/docs/Examples/index.md
index a89d76ca..279a5118 100644
--- a/docs/pages/docs/Examples/index.md
+++ b/docs/pages/docs/Examples/index.md
@@ -7,7 +7,7 @@ template: layouts/docs/list
 ---
 
 
-We have an [example in the repo](https://github.com/simolus3/moor/tree/master/moor_flutter/example), it's a simple todo list app,
+We have an [example in the repo](https://github.com/simolus3/drift/tree/master/moor_flutter/example), it's a simple todo list app,
 written with drift. [Rody Davis](https://github.com/rodydavis) has built a cleaner version of the example that works on all
 Flutter platforms - including Web and Desktop! You can check it out [here](https://github.com/rodydavis/moor_shared).
 [Abdelrahman Mostafa Elmarakby](https://github.com/abdelrahmanelmarakby) wrote an animated version of the todo app available [here](https://github.com/abdelrahmanelmarakby/todo_with_moor_and_animation).
diff --git a/docs/pages/docs/Internals/index.md b/docs/pages/docs/Internals/index.md
index 171e72ab..ec979e9c 100644
--- a/docs/pages/docs/Internals/index.md
+++ b/docs/pages/docs/Internals/index.md
@@ -15,17 +15,17 @@ published to pub. For that, add an `dependency_overrides` section to your pubspe
 dependency_overrides:
   drift:
     git:
-      url: https://github.com/simolus3/moor.git
+      url: https://github.com/simolus3/drift.git
       ref: develop
       path: drift
   drift_dev:
     git:
-      url: https://github.com/simolus3/moor.git
+      url: https://github.com/simolus3/drift.git
       ref: develop
       path: drift_dev
   sqlparser:
     git:
-      url: https://github.com/simolus3/moor.git
+      url: https://github.com/simolus3/drift.git
       ref: develop
       path: sqlparser
 ```
diff --git a/docs/pages/docs/Other engines/encryption.md b/docs/pages/docs/Other engines/encryption.md
index cd189d00..ccddf683 100644
--- a/docs/pages/docs/Other engines/encryption.md	
+++ b/docs/pages/docs/Other engines/encryption.md	
@@ -25,7 +25,7 @@ dependencies:
   drift: ^{{ versions.drift }}
   encrypted_moor:
    git:
-    url: https://github.com/simolus3/moor.git
+    url: https://github.com/simolus3/drift.git
     path: extras/encryption 
 ```
 
diff --git a/docs/pages/docs/Other engines/web.md b/docs/pages/docs/Other engines/web.md
index 1760aa20..d85804c1 100644
--- a/docs/pages/docs/Other engines/web.md	
+++ b/docs/pages/docs/Other engines/web.md	
@@ -122,7 +122,7 @@ object via `window.db`. If you need to quickly run a query to check the state of
 `db.exec(sql)`.
 If you need to delete your databases, there stored using local storage. You can clear all your data with `localStorage.clear()`.
 
-Web support is experimental at the moment, so please [report all issues](https://github.com/simolus3/moor/issues/new) you find.
+Web support is experimental at the moment, so please [report all issues](https://github.com/simolus3/drift/issues/new) you find.
 
 ## Using IndexedDb
 
@@ -199,7 +199,7 @@ You can pass that `DatabaseConnection` to your database by enabling the
 For more information on the `DatabaseConnection` class, see the documentation on
 [isolates]({{ "../Advanced Features/isolates.md" | pageUrl }}).
 
-A small, but working example is available under [extras/web_worker_example](https://github.com/simolus3/moor/tree/develop/extras/web_worker_example)
+A small, but working example is available under [extras/web_worker_example](https://github.com/simolus3/drift/tree/develop/extras/web_worker_example)
 in the drift repository.
 
 ### Flutter
@@ -208,7 +208,7 @@ Flutter web doesn't compile `.dart` files in web folder and won't use `.js` file
 `build_web_compilers` either. Instead, we'll use Dart's build system to manually compile the worker to a
 JavaScript file before using Flutter-specific tooling.
 
-Example is available under [extras/flutter_web_worker_example](https://github.com/simolus3/moor/tree/develop/extras/flutter_web_worker_example)
+Example is available under [extras/flutter_web_worker_example](https://github.com/simolus3/drift/tree/develop/extras/flutter_web_worker_example)
 in the drift repository.
 
 First, add [build_web_compilers](https://pub.dev/packages/build_web_compilers) to the project:
diff --git a/docs/pages/docs/Using SQL/sql_ide.md b/docs/pages/docs/Using SQL/sql_ide.md
index ff30815f..94a8c255 100644
--- a/docs/pages/docs/Using SQL/sql_ide.md	
+++ b/docs/pages/docs/Using SQL/sql_ide.md	
@@ -56,7 +56,7 @@ Unfortunately, we can't support IntelliJ and Android Studio yet. Please vote on
 
 As a workaround, you can configure IntelliJ to recognize drift files as sql. Drift-only
 features like imports and Dart templates will report errors, but the rest of the
-syntax works well. See [this comment](https://github.com/simolus3/moor/issues/150#issuecomment-538582696)
+syntax works well. See [this comment](https://github.com/simolus3/drift/issues/150#issuecomment-538582696)
 on how to set this up.
 
 If you're looking for support for an other IDE that uses the Dart analysis server,
diff --git a/docs/pages/docs/name.md b/docs/pages/docs/name.md
index 7b39de34..30875460 100644
--- a/docs/pages/docs/name.md
+++ b/docs/pages/docs/name.md
@@ -53,7 +53,7 @@ Also, you may have to
 
 Congratulations, your project is now using drift!
 
-If you run into any issues with the automatic migration tool, please [open an issue](https://github.com/simolus3/moor/issues/new/).
+If you run into any issues with the automatic migration tool, please [open an issue](https://github.com/simolus3/drift/issues/new/).
 
 ## Manual migration
 
diff --git a/docs/pages/docs/platforms.md b/docs/pages/docs/platforms.md
index d10479d3..e10686a9 100644
--- a/docs/pages/docs/platforms.md
+++ b/docs/pages/docs/platforms.md
@@ -47,10 +47,10 @@ with `flutter test`.
     in your `build.gradle` to remove those binaries.
   - Opening `libsqlite3.so` fails on some Android 6.0.1 devices. This can be fixed by setting
     `android.bundle.enableUncompressedNativeLibs=false` in your `gradle.properties` file.
-    Note that this will increase the disk usage of your app. See [this issue](https://github.com/simolus3/moor/issues/895#issuecomment-720195005)
+    Note that this will increase the disk usage of your app. See [this issue](https://github.com/simolus3/drift/issues/895#issuecomment-720195005)
     for details.
   - Out of memory errors for very complex queries: Since the regular tmp directory isn't available on Android, you need to inform
-    sqlite3 about the right directory to store temporary data. See [this comment](https://github.com/simolus3/moor/issues/876#issuecomment-710013503)
+    sqlite3 about the right directory to store temporary data. See [this comment](https://github.com/simolus3/drift/issues/876#issuecomment-710013503)
     for an example on how to do that.
 {% endblock %}
 
diff --git a/docs/tool/ci_build.dart b/docs/tool/ci_build.dart
index 7caaa299..3f5badb1 100644
--- a/docs/tool/ci_build.dart
+++ b/docs/tool/ci_build.dart
@@ -78,7 +78,7 @@ Future<void> _createApiDocumentation(Directory output) async {
 
   // Dartdoc supports %r% for the revision, %f% for the file name and %l% for
   // the line number.
-  const source = 'https://github.com/simolus3/moor/blob/%r%/%f%/#L%l%';
+  const source = 'https://github.com/simolus3/drift/blob/%r%/%f%/#L%l%';
   // todo: Use `dart doc` after https://github.com/dart-lang/sdk/issues/46100#issuecomment-1033899215
   // gets clarified.
   final dartDoc = await Process.start(
diff --git a/docs/website.yaml b/docs/website.yaml
index 43f554ba..0084a360 100644
--- a/docs/website.yaml
+++ b/docs/website.yaml
@@ -5,7 +5,7 @@ site:
   title: "Drift"
   language: "en"
   copyright: "Simon Binder"
-  github_repo: "https://github.com/simolus3/moor"
+  github_repo: "https://github.com/simolus3/drift"
   github_subdir: "docs/"
   github_branch: develop
   gcs_engine_id: set # this just needs to be set so that the search box shows
@@ -20,7 +20,7 @@ site:
         url: "https://gitter.im/moor-dart/community"
         icon: "fab fa-gitter"
       - name: "Project on GitHub"
-        url: "https://github.com/simolus3/moor"
+        url: "https://github.com/simolus3/drift"
         icon: "fab fa-github"
         desc: "Development takes place here"
   menu:
@@ -30,7 +30,7 @@ site:
       - name: "Pub"
         url: "https://pub.dev/packages/drift"
       - name: "GitHub"
-        url: "https://github.com/simolus3/moor/"
+        url: "https://github.com/simolus3/drift/"
       - name: "API docs"
         url: "/api/"
 
diff --git a/drift/README.md b/drift/README.md
index c49bedf4..373e35d9 100644
--- a/drift/README.md
+++ b/drift/README.md
@@ -40,8 +40,8 @@ __To start using drift, read our detailed [docs](https://drift.simonbinder.eu/do
 
 
 If you have any questions, feedback or ideas, feel free to [create an
-issue](https://github.com/simolus3/moor/issues/new). If you enjoy this
-project, I'd appreciate your [🌟 on GitHub](https://github.com/simolus3/moor/).
+issue](https://github.com/simolus3/drift/issues/new). If you enjoy this
+project, I'd appreciate your [🌟 on GitHub](https://github.com/simolus3/drift/).
 
 
 ## For the web
diff --git a/drift/lib/src/dsl/columns.dart b/drift/lib/src/dsl/columns.dart
index 1c7180ea..24e89c62 100644
--- a/drift/lib/src/dsl/columns.dart
+++ b/drift/lib/src/dsl/columns.dart
@@ -97,7 +97,7 @@ extension BuildColumn<T> on ColumnBuilder<T> {
   /// This can be used to implement constraints that drift does not (yet)
   /// support (e.g. unique keys, etc.). If you've found a common use-case for
   /// this, it should be considered a limitation of drift itself. Please feel
-  /// free to open an issue at https://github.com/simolus3/moor/issues/new to
+  /// free to open an issue at https://github.com/simolus3/drift/issues/new to
   /// report that.
   ///
   /// See also:
diff --git a/drift/lib/src/ffi/database.dart b/drift/lib/src/ffi/database.dart
index 686487bb..d5290ff6 100644
--- a/drift/lib/src/ffi/database.dart
+++ b/drift/lib/src/ffi/database.dart
@@ -108,7 +108,7 @@ class NativeDatabase extends DelegatedDatabase {
   /// }
   /// ```
   ///
-  /// For more information, see [issue 835](https://github.com/simolus3/moor/issues/835).
+  /// For more information, see [issue 835](https://github.com/simolus3/drift/issues/835).
   @experimental
   static void closeExistingInstances() {
     tracker.closeExisting();
diff --git a/drift/lib/src/ffi/database_tracker.dart b/drift/lib/src/ffi/database_tracker.dart
index 2a48e99b..1cb30451 100644
--- a/drift/lib/src/ffi/database_tracker.dart
+++ b/drift/lib/src/ffi/database_tracker.dart
@@ -2,7 +2,7 @@ import 'dart:ffi';
 
 import 'package:sqlite3/sqlite3.dart';
 
-/// This entire file is an elaborate hack to workaround https://github.com/simolus3/moor/issues/835.
+/// This entire file is an elaborate hack to workaround https://github.com/simolus3/drift/issues/835.
 ///
 /// Users were running into database deadlocks after (stateless) hot restarts
 /// in Flutter when they use transactions. The problem is that we don't have a
diff --git a/drift/lib/src/runtime/data_class.dart b/drift/lib/src/runtime/data_class.dart
index fd45ded1..81eb66d2 100644
--- a/drift/lib/src/runtime/data_class.dart
+++ b/drift/lib/src/runtime/data_class.dart
@@ -56,7 +56,7 @@ abstract class DataClass {
 ///
 /// See also:
 /// - the explanation in the changelog for 1.5
-/// - https://github.com/simolus3/moor/issues/25
+/// - https://github.com/simolus3/drift/issues/25
 abstract class UpdateCompanion<D> implements Insertable<D> {
   /// Constant constructor so that generated companion classes can be constant.
   const UpdateCompanion();
diff --git a/drift/lib/src/runtime/executor/executor.dart b/drift/lib/src/runtime/executor/executor.dart
index 045c1bb9..e0df8536 100644
--- a/drift/lib/src/runtime/executor/executor.dart
+++ b/drift/lib/src/runtime/executor/executor.dart
@@ -9,7 +9,7 @@ import 'package:drift/drift.dart' show OpeningDetails;
 ///
 /// This is an internal api of drift, which can break often. If you want to
 /// implement custom database backends, consider using the new `backends` API.
-/// The [NativeDatabase implementation](https://github.com/simolus3/moor/blob/develop/drift/lib/src/ffi/database.dart)
+/// The [NativeDatabase implementation](https://github.com/simolus3/drift/blob/develop/drift/lib/src/ffi/database.dart)
 /// might be useful as a reference. If you want to write your own database
 /// engine to use with drift and run into issues, please consider creating an
 /// issue.
diff --git a/drift/lib/src/runtime/query_builder/expressions/expression.dart b/drift/lib/src/runtime/query_builder/expressions/expression.dart
index 3369842b..4b4c9e09 100644
--- a/drift/lib/src/runtime/query_builder/expressions/expression.dart
+++ b/drift/lib/src/runtime/query_builder/expressions/expression.dart
@@ -421,7 +421,7 @@ class _CastInSqlExpression<D1, D2> extends Expression<D2> {
 /// A sql expression that calls a function.
 ///
 /// This class is mainly used by drift internally. If you find yourself using
-/// this class, consider [creating an issue](https://github.com/simolus3/moor/issues/new)
+/// this class, consider [creating an issue](https://github.com/simolus3/drift/issues/new)
 /// to request native support in drift.
 class FunctionCallExpression<R> extends Expression<R> {
   /// The name of the function to call
diff --git a/drift/pubspec.yaml b/drift/pubspec.yaml
index f136a7f6..55598655 100644
--- a/drift/pubspec.yaml
+++ b/drift/pubspec.yaml
@@ -1,9 +1,9 @@
 name: drift
 description: Drift is a reactive library to store relational data in Dart and Flutter applications.
 version: 1.5.0-dev
-repository: https://github.com/simolus3/moor
+repository: https://github.com/simolus3/drift
 homepage: https://drift.simonbinder.eu/
-issue_tracker: https://github.com/simolus3/moor/issues
+issue_tracker: https://github.com/simolus3/drift/issues
 
 environment:
   sdk: '>=2.15.0 <3.0.0'
diff --git a/drift/test/custom_queries_test.dart b/drift/test/custom_queries_test.dart
index a10ce962..818e6a3f 100644
--- a/drift/test/custom_queries_test.dart
+++ b/drift/test/custom_queries_test.dart
@@ -80,7 +80,7 @@ void main() {
   });
 
   test('custom statement', () async {
-    // regression test for https://github.com/simolus3/moor/issues/199 - the
+    // regression test for https://github.com/simolus3/drift/issues/199 - the
     // mock will throw when used before opening
     expect(db.customStatement('UPDATE tbl SET a = b'), completes);
   }, onPlatform: const {
diff --git a/drift/test/data/tables/tables.drift b/drift/test/data/tables/tables.drift
index 771253e9..0148a192 100644
--- a/drift/test/data/tables/tables.drift
+++ b/drift/test/data/tables/tables.drift
@@ -37,7 +37,7 @@ CREATE TABLE mytable (
 
 CREATE VIRTUAL TABLE email USING fts5(sender, title, body) AS EMail;
 
--- Weird table, repro for https://github.com/simolus3/moor/issues/932
+-- Weird table, repro for https://github.com/simolus3/drift/issues/932
 CREATE TABLE "Expression" (
     class INTEGER NOT NULL AS "sqlClass",
     "text" TEXT NOT NULL AS "textColumn"
diff --git a/drift/test/expressions/expression_test.dart b/drift/test/expressions/expression_test.dart
index 03afcd7f..9f36ba04 100644
--- a/drift/test/expressions/expression_test.dart
+++ b/drift/test/expressions/expression_test.dart
@@ -68,7 +68,7 @@ void main() {
   });
 
   test('does not count columns with useColumns: false', () {
-    // Regression test for https://github.com/simolus3/moor/issues/1189
+    // Regression test for https://github.com/simolus3/drift/issues/1189
     final db = TodoDb();
 
     expect(
diff --git a/drift/test/insert_test.dart b/drift/test/insert_test.dart
index 06c07fdb..4f973a6a 100644
--- a/drift/test/insert_test.dart
+++ b/drift/test/insert_test.dart
@@ -29,7 +29,7 @@ void main() {
   });
 
   test('can insert floating point values', () async {
-    // regression test for https://github.com/simolus3/moor/issues/30
+    // regression test for https://github.com/simolus3/drift/issues/30
     await db.into(db.tableWithoutPK).insert(
         CustomRowClass.map(42, 3.1415, custom: MyCustomObject('custom'))
             .toInsertable());
diff --git a/drift/test/integration_tests/moor_files_test.dart b/drift/test/integration_tests/moor_files_test.dart
index 9cec4df3..b9c423a3 100644
--- a/drift/test/integration_tests/moor_files_test.dart
+++ b/drift/test/integration_tests/moor_files_test.dart
@@ -95,7 +95,7 @@ void main() {
   });
 
   test('supports absent values for primary key integers', () async {
-    // regression test for #112: https://github.com/simolus3/moor/issues/112
+    // regression test for #112: https://github.com/simolus3/drift/issues/112
 
     await db.into(db.mytable).insert(const MytableCompanion());
     verify(mock.runInsert('INSERT INTO mytable DEFAULT VALUES', []));
diff --git a/drift/test/integration_tests/regress_1235_test.dart b/drift/test/integration_tests/regress_1235_test.dart
index 10d2b2c4..05131dd9 100644
--- a/drift/test/integration_tests/regress_1235_test.dart
+++ b/drift/test/integration_tests/regress_1235_test.dart
@@ -7,7 +7,7 @@ import '../data/tables/todos.dart';
 
 void main() {
   test('creating a database instance does not schedule async work', () {
-    // See https://github.com/simolus3/moor/issues/1235. We shouldn't run async
+    // See https://github.com/simolus3/drift/issues/1235. We shouldn't run async
     // work without users being aware of it, and no one expects creating an
     // instance to schedule new microtasks.
     noAsync(() => TodoDb(NativeDatabase.memory()));
diff --git a/drift/test/isolate_test.dart b/drift/test/isolate_test.dart
index 3e953e19..ce944e9c 100644
--- a/drift/test/isolate_test.dart
+++ b/drift/test/isolate_test.dart
@@ -201,7 +201,7 @@ void _runTests(FutureOr<DriftIsolate> Function() spawner, bool terminateIsolate,
   });
 
   test('transactions have an isolated view on data', () async {
-    // regression test for https://github.com/simolus3/moor/issues/324
+    // regression test for https://github.com/simolus3/drift/issues/324
     await database
         .customStatement('create table tbl (id integer primary key not null)');
 
@@ -273,7 +273,7 @@ void _runTests(FutureOr<DriftIsolate> Function() spawner, bool terminateIsolate,
   });
 
   test('supports single quotes in text', () async {
-    // Regression test for https://github.com/simolus3/moor/issues/1179
+    // Regression test for https://github.com/simolus3/drift/issues/1179
     await database.customStatement('CREATE TABLE sample(title TEXT)');
     await database.customStatement('INSERT INTO sample VALUES '
         "('O''Connor'), ('Tomeo''s');");
diff --git a/drift/test/join_test.dart b/drift/test/join_test.dart
index 09b4ba2e..c02d7a9d 100644
--- a/drift/test/join_test.dart
+++ b/drift/test/join_test.dart
@@ -157,7 +157,7 @@ void main() {
   });
 
   test('updates when any queried table changes in transaction', () {
-    // Nonsense query, repro for https://github.com/simolus3/moor/issues/910
+    // Nonsense query, repro for https://github.com/simolus3/drift/issues/910
     final a = db.users;
     final b = db.categories;
     final c = db.sharedTodos;
diff --git a/drift/test/rx_streams_test.dart b/drift/test/rx_streams_test.dart
index b80a8214..e8dcdc34 100644
--- a/drift/test/rx_streams_test.dart
+++ b/drift/test/rx_streams_test.dart
@@ -14,7 +14,7 @@ void main() {
   });
 
   test('drift streams can be used with switchMap in rxdart', () async {
-    // Regression test for https://github.com/simolus3/moor/issues/500
+    // Regression test for https://github.com/simolus3/drift/issues/500
     when(executor.runSelect(any, any)).thenAnswer((i) async {
       final sql = i.positionalArguments.first as String;
 
diff --git a/drift_dev/CHANGELOG.md b/drift_dev/CHANGELOG.md
index 7bdb45a2..2338d002 100644
--- a/drift_dev/CHANGELOG.md
+++ b/drift_dev/CHANGELOG.md
@@ -26,7 +26,7 @@
 
 ## 1.1.0
 
-- Consider `drift`-named files when generating schema migrations ([#1486](https://github.com/simolus3/moor/issues/1486))
+- Consider `drift`-named files when generating schema migrations ([#1486](https://github.com/simolus3/drift/issues/1486))
 - Emit correct SQL code when using arrays with the `new_sql_code_generation`
   option in specific scenarios.
 - Transform `.moor.dart` part files in the `migrate` command.
diff --git a/drift_dev/lib/src/backends/plugin/logger.dart b/drift_dev/lib/src/backends/plugin/logger.dart
index f5e63f03..f1376303 100644
--- a/drift_dev/lib/src/backends/plugin/logger.dart
+++ b/drift_dev/lib/src/backends/plugin/logger.dart
@@ -17,7 +17,7 @@ void setupLogger(MoorPlugin plugin) {
       // issue on the Dart SDK repo for that. We're responsible for the problem
       // though, so tell the user to not annoy the Dart Team with this.
       final message = 'PLEASE DO NOT REPORT THIS ON dart-lang/sdk! '
-          'This should be reported via https://github.com/simolus3/moor/issues/new '
+          'This should be reported via https://github.com/simolus3/drift/issues/new '
           'instead. Message was ${rec.message}, error ${rec.error}';
 
       final error =
diff --git a/drift_dev/lib/src/backends/plugin/plugin.dart b/drift_dev/lib/src/backends/plugin/plugin.dart
index d4bdb21e..2e78833a 100644
--- a/drift_dev/lib/src/backends/plugin/plugin.dart
+++ b/drift_dev/lib/src/backends/plugin/plugin.dart
@@ -48,7 +48,7 @@ class MoorPlugin extends ServerPlugin
   String get version => '4.4.1';
   @override
   String get contactInfo =>
-      'Create an issue at https://github.com/simolus3/moor/';
+      'Create an issue at https://github.com/simolus3/drift/';
 
   void _didCreateDriver(MoorDriver driver) {
     driver.tryToLoadOptions();
diff --git a/drift_dev/pubspec.yaml b/drift_dev/pubspec.yaml
index 546922d4..d398b586 100644
--- a/drift_dev/pubspec.yaml
+++ b/drift_dev/pubspec.yaml
@@ -1,9 +1,9 @@
 name: drift_dev
 description: Dev-dependency for users of drift. Contains a the generator and development tools.
 version: 1.5.0-dev
-repository: https://github.com/simolus3/moor
+repository: https://github.com/simolus3/drift
 homepage: https://drift.simonbinder.eu/
-issue_tracker: https://github.com/simolus3/moor/issues
+issue_tracker: https://github.com/simolus3/drift/issues
 
 environment:
   sdk: '>=2.14.0 <3.0.0'
diff --git a/drift_dev/test/analyzer/moor/regression_754_test.dart b/drift_dev/test/analyzer/moor/regression_754_test.dart
index c4b687ff..15aa8d13 100644
--- a/drift_dev/test/analyzer/moor/regression_754_test.dart
+++ b/drift_dev/test/analyzer/moor/regression_754_test.dart
@@ -4,7 +4,7 @@ import 'package:test/test.dart';
 import '../utils.dart';
 
 void main() {
-  // Regression test for https://github.com/simolus3/moor/issues/754
+  // Regression test for https://github.com/simolus3/drift/issues/754
   test('supports fts5 tables with external content', () async {
     final state = TestState.withContent({
       'foo|lib/a.moor': '''
diff --git a/drift_dev/test/analyzer/view/from_import_test.dart b/drift_dev/test/analyzer/view/from_import_test.dart
index de28a14c..8912236d 100644
--- a/drift_dev/test/analyzer/view/from_import_test.dart
+++ b/drift_dev/test/analyzer/view/from_import_test.dart
@@ -3,7 +3,7 @@ import 'package:test/test.dart';
 import '../utils.dart';
 
 void main() {
-  // Regression test for https://github.com/simolus3/moor/issues/1639
+  // Regression test for https://github.com/simolus3/drift/issues/1639
   test('imported views are analyzed', () async {
     final testState = TestState.withContent({
       'a|lib/imported.drift': '''
diff --git a/drift_dev/test/utils/entity_reference_sorter_test.dart b/drift_dev/test/utils/entity_reference_sorter_test.dart
index a9fba509..16d31810 100644
--- a/drift_dev/test/utils/entity_reference_sorter_test.dart
+++ b/drift_dev/test/utils/entity_reference_sorter_test.dart
@@ -44,7 +44,7 @@ void main() {
   });
 
   test('accepts self-references', () {
-    // https://github.com/simolus3/moor/issues/586
+    // https://github.com/simolus3/drift/issues/586
     final a = MoorTable(sqlName: 'a', dartTypeName: 'a');
     final b = MoorTable(sqlName: 'b', dartTypeName: 'b');
 
diff --git a/extras/drift_postgres/README.md b/extras/drift_postgres/README.md
index 7f5e7377..e7c5199f 100644
--- a/extras/drift_postgres/README.md
+++ b/extras/drift_postgres/README.md
@@ -10,7 +10,7 @@ dependencies:
   drift: "$latest version"
   drift_postgres:
    git:
-    url: https://github.com/simolus3/moor.git
+    url: https://github.com/simolus3/drift.git
     path: extras/dirft_postgres
 ```
 
diff --git a/extras/encryption/README.md b/extras/encryption/README.md
index daa92a8a..65badbce 100644
--- a/extras/encryption/README.md
+++ b/extras/encryption/README.md
@@ -3,7 +3,7 @@ Moor version that uses the
 sqflite.
 
 ## Using this
-For general notes on using moor, see [this guide](https://moor.simonbinder.eu/getting-started/).
+For general notes on using moor, see [this guide](https://drift.simonbinder.eu/getting-started/).
 
 Instead of using `moor_flutter`, use this:
 ```yaml
@@ -11,11 +11,11 @@ dependencies:
   moor: "$latest version"
   encrypted_moor:
    git:
-    url: https://github.com/simolus3/moor.git
-    path: extras/encryption 
+    url: https://github.com/simolus3/drift.git
+    path: extras/encryption
 ```
 
-To use this, you can stop depending on `moor_flutter`. Then, instead of using 
+To use this, you can stop depending on `moor_flutter`. Then, instead of using
 a `FlutterQueryExecutor`, import `package:moor/moor.dart` and `package:encrypted_moor/encrypted_moor.dart`.
 
 You can then replace the `FlutterQueryExecutor` with an `EncryptedExecutor`.
diff --git a/extras/integration_tests/tests/lib/suite/crud_tests.dart b/extras/integration_tests/tests/lib/suite/crud_tests.dart
index 36ebf660..13c9cabc 100644
--- a/extras/integration_tests/tests/lib/suite/crud_tests.dart
+++ b/extras/integration_tests/tests/lib/suite/crud_tests.dart
@@ -73,7 +73,7 @@ void crudTests(TestExecutor executor) {
           : 'Runner does not support RETURNING');
 
   test('IN ? expressions can be expanded', () async {
-    // regression test for https://github.com/simolus3/moor/issues/156
+    // regression test for https://github.com/simolus3/drift/issues/156
     final db = Database(executor.createConnection());
     final result = await db.usersById([1, 2, 3]).get();
 
@@ -95,7 +95,7 @@ void crudTests(TestExecutor executor) {
   });
 
   test('runCustom with args', () async {
-    // https://github.com/simolus3/moor/issues/406
+    // https://github.com/simolus3/drift/issues/406
     final db = Database(executor.createConnection());
 
     // ignore: invalid_use_of_visible_for_testing_member, invalid_use_of_protected_member
diff --git a/extras/integration_tests/web/test/saves_after_migration_regression_test.dart b/extras/integration_tests/web/test/saves_after_migration_regression_test.dart
index 99d8cb4d..81c29abd 100644
--- a/extras/integration_tests/web/test/saves_after_migration_regression_test.dart
+++ b/extras/integration_tests/web/test/saves_after_migration_regression_test.dart
@@ -7,7 +7,7 @@ import 'package:test/test.dart';
 
 part 'saves_after_migration_regression_test.g.dart';
 
-// This is a regression test for https://github.com/simolus3/moor/issues/273
+// This is a regression test for https://github.com/simolus3/drift/issues/273
 
 class Foos extends Table {
   IntColumn get id => integer().autoIncrement()();
diff --git a/extras/plugin_example/README.md b/extras/plugin_example/README.md
index c1c7c4e7..8401487a 100644
--- a/extras/plugin_example/README.md
+++ b/extras/plugin_example/README.md
@@ -25,7 +25,7 @@ have already cloned the `moor` repository.
   
 ## Debugging
 Note: If you only want to _use_ the plugin and don't care about debugging it, follow the step
-from the [user documentation](https://moor.simonbinder.eu/docs/using-sql/sql_ide/).
+from the [user documentation](https://drift.simonbinder.eu/docs/using-sql/sql_ide/).
 
 After you completed the setup, these steps will open an editor instance that runs the plugin.
 1. chdir into `moor_generator` and run `dart bin/moor_generator.dart debug-plugin`.
diff --git a/moor/CHANGELOG.md b/moor/CHANGELOG.md
index 98048323..2c0d2121 100644
--- a/moor/CHANGELOG.md
+++ b/moor/CHANGELOG.md
@@ -35,7 +35,7 @@ Automated migration tooling exists! See https://drift.simonbinder.eu/name for de
 - Support selecting views declared in a moor file in Dart (with `select`,
   `join` and similar methods)
 - Add the `scoped_dart_components` builder option to generate a function for
-  [Dart components in SQL](https://moor.simonbinder.eu/docs/using-sql/moor_files/#dart-components-in-sql).
+  [Dart components in SQL](https://drift.simonbinder.eu/docs/using-sql/moor_files/#dart-components-in-sql).
   The function's parameters reflect tables that are in scope.
 - Add the `UpsertMultiple` class to run multiple upsert clauses in an insert.
   This requires sqlite3 version 3.35 or later.
@@ -115,7 +115,7 @@ Automated migration tooling exists! See https://drift.simonbinder.eu/name for de
 ## 3.4.0
 
 - New `TableMigration` api to make complex table migrations easier. See the
-  [updated documentation](https://moor.simonbinder.eu/docs/advanced-features/migrations/#complex-migrations) for details
+  [updated documentation](https://drift.simonbinder.eu/docs/advanced-features/migrations/#complex-migrations) for details
   on how to use this feature.
 - New `DatabaseConnection.delayed` constructor to synchronously obtain a database connection that requires an async
   setup. This can be useful when connecting to a `MoorIsolate`.
@@ -123,7 +123,7 @@ Automated migration tooling exists! See https://drift.simonbinder.eu/name for de
 - New feature in moor files: You can now set the default value for Dart templates:
   `filter ($predicate = TRUE): SELECT * FROM my_table WHERE $predicate`. This generates an optional named parameter in
   Dart.
-- New `generate_values_in_copy_with` [build option](https://moor.simonbinder.eu/docs/advanced-features/builder_options/)
+- New `generate_values_in_copy_with` [build option](https://drift.simonbinder.eu/docs/advanced-features/builder_options/)
   . It wraps nullable columns in a `Value` in `copyWith` methods so that they can be set to `null`.
 - Added `groupConcat`, `cast` and `coalesce` functions to the Dart query builder.
 - Added `renameColumn` to `Migrator` to generate `ALTER TABLE RENAME COLUMN` statements.
@@ -139,14 +139,14 @@ Automated migration tooling exists! See https://drift.simonbinder.eu/name for de
 - New `package:moor/ffi.dart` library to replace the `moor_ffi` package. When migrating, Flutter users need to depend on
   the `sqlite3_flutter_libs` package as well. The changelog of `moor_ffi` contains further information about this
 - New (in
-  generator): `apply_converters_on_variables` [build option](https://moor.simonbinder.eu/docs/advanced-features/builder_options/)
+  generator): `apply_converters_on_variables` [build option](https://drift.simonbinder.eu/docs/advanced-features/builder_options/)
   . When enabled, type converter will be enabled on variables for analyzed queries. This will be the default option in
   the future.
 
 ## 3.2.0
 
 - It's now possible to change the name of a class generated for moor-file queries. See
-  [the documentation](https://moor.simonbinder.eu/docs/using-sql/moor_files/#result-class-names) for details.
+  [the documentation](https://drift.simonbinder.eu/docs/using-sql/moor_files/#result-class-names) for details.
 - Added the `multiLine`, `caseSensitive`, `unicode` and `doAll` flags to the `regex` sql extension method. They
   require `moor_ffi` version `0.7.0` or later.
 
@@ -156,17 +156,17 @@ Automated migration tooling exists! See https://drift.simonbinder.eu/name for de
 - New `containsCase` method for text in `package:moor/extensions/moor_ffi.dart`
 - The `toCompanion` method is back for data classes, but its generation can be disabled with a build option
 - New
-  feature: [Implicit enum converters](https://moor.simonbinder.eu/docs/advanced-features/type_converters/#implicit-enum-converters)
+  feature: [Implicit enum converters](https://drift.simonbinder.eu/docs/advanced-features/type_converters/#implicit-enum-converters)
 - Added the `destructiveFallback` extension to databases. It can be used in `migrationStrategy` to delete and then
   re-create all tables, indices and triggers.
 
 ## 3.0.2
 
-- Fix update statements not escaping column names ([#539](https://github.com/simolus3/moor/issues/539))
+- Fix update statements not escaping column names ([#539](https://github.com/simolus3/drift/issues/539))
 
 ## 3.0.1
 
-- Fix `mapFromRowOrNull` not working without a prefix ([#534](https://github.com/simolus3/moor/pull/534))
+- Fix `mapFromRowOrNull` not working without a prefix ([#534](https://github.com/simolus3/drift/pull/534))
 
 ## 3.0.0
 
@@ -200,20 +200,20 @@ Automated migration tooling exists! See https://drift.simonbinder.eu/name for de
 - Moor will no longer wait for query stream listeners to receive a done event when closing a database or transaction.
 - Updated stream queries: They now take triggers into account and more accurately detect when an update is necessary.
 - New `tableUpdates` method that can be used to listen for a subset of table updates outside of a query.
-- New feature: Nested results for compiled queries ([#288](https://github.com/simolus3/moor/issues/288))
-  See the [documentation](https://moor.simonbinder.eu/docs/using-sql/moor_files/#nested-results) for details on how and
+- New feature: Nested results for compiled queries ([#288](https://github.com/simolus3/drift/issues/288))
+  See the [documentation](https://drift.simonbinder.eu/docs/using-sql/moor_files/#nested-results) for details on how and
   when to use this feature.
 - New feature: Use sql expressions for inserts or updates with the new `custom` factory on companions
 - New feature: Upserts in the Dart api! Read everything you need to know
-  [here](https://moor.simonbinder.eu/docs/getting-started/writing_queries/#upserts).
+  [here](https://drift.simonbinder.eu/docs/getting-started/writing_queries/#upserts).
 - Support using `MoorIsolates` in scenarios where only primitive messages can be passed between isolates.
 
 ## 2.4.2
 
 - Fix `beforeOpen` callback deadlocking when using the isolate executor
-  ([#431](https://github.com/simolus3/moor/issues/431))
+  ([#431](https://github.com/simolus3/drift/issues/431))
 - Fix limit clause not being applied when using `.join` afterwards
-  ([#433](https://github.com/simolus3/moor/issues/433))
+  ([#433](https://github.com/simolus3/drift/issues/433))
 
 ## 2.4.1
 
@@ -223,21 +223,21 @@ Automated migration tooling exists! See https://drift.simonbinder.eu/name for de
 
 - Support aggregate expressions and `group by` in the Dart api
 - Support type converters in moor files!
-  The [documentation](https://moor.simonbinder.eu/docs/advanced-features/type_converters/)
+  The [documentation](https://drift.simonbinder.eu/docs/advanced-features/type_converters/)
   has been updated to explain how to use them.
-- Support stream queries in transactions ([#356](https://github.com/simolus3/moor/issues/365))
+- Support stream queries in transactions ([#356](https://github.com/simolus3/drift/issues/365))
 - Support table-valued functions (like `json_each` and `json_tree`) in moor files
-  [#260](https://github.com/simolus3/moor/issues/260).
-- Fix a crash when opening a transaction without using it ([#361](https://github.com/simolus3/moor/issues/361))
+  [#260](https://github.com/simolus3/drift/issues/260).
+- Fix a crash when opening a transaction without using it ([#361](https://github.com/simolus3/drift/issues/361))
 - New `mapFromCompanion` method in generated tables to convert a `UpdateCompanion` to a model.
 - Support generated moor classes in other builders (like `built_value`).
-  Details [in the docs](https://moor.simonbinder.eu/docs/advanced-features/builder_options/)
+  Details [in the docs](https://drift.simonbinder.eu/docs/advanced-features/builder_options/)
 
 ## 2.3.0
 
 - New `clientDefault` method for columns. It can be used for dynamic defaults that might be different for each row. For
   instance, you can generate a uuid for each row with `text().clientDefault(() => Uuid().v4()();`
-- New CLI tool to analyze moor files: Learn more at [https://moor.simonbinder.eu/cli](https://moor.simonbinder.eu/cli)
+- New CLI tool to analyze moor files: Learn more at [https://drift.simonbinder.eu/cli](https://drift.simonbinder.eu/cli)
 - Ability to override the default `ValueSerializer` globally by using `moorRuntimeOptions.valueSerializer`.
 - Moor files: You can now explicitly declare column types in those cases that the analyzer can't infer it:
   ```
@@ -246,13 +246,13 @@ Automated migration tooling exists! See https://drift.simonbinder.eu/name for de
 - Support for triggers and indices! You can declare them in a `.moor` file with a regular `CREATE TRIGGER`
   or `CREATE INDEX` statement. Both triggers and indices will be created in the default `onCreate` function. To create
   them in `onUpgrade`, use the new `createIndex` and `createTrigger` functions on a `Migrator`.
-- Support for moor-file queries that run on initialization ([#280](https://github.com/simolus3/moor/issues/280))
+- Support for moor-file queries that run on initialization ([#280](https://github.com/simolus3/drift/issues/280))
   Declare them like this `@create: INSERT INTO users VALUES ('default', 'user')`
-- Support deletes in batches ([#325](https://github.com/simolus3/moor/issues/325))
+- Support deletes in batches ([#325](https://github.com/simolus3/drift/issues/325))
 - Reduce unnecessary queries when a stream is unsubscribed and then
-  re-subscribed ([#329](https://github.com/simolus3/moor/issues/329))
+  re-subscribed ([#329](https://github.com/simolus3/drift/issues/329))
 - Experimental new type inference for the sql analyzer. For details, check the
-  `use_experimental_inference` [build option](https://moor.simonbinder.eu/docs/advanced-features/builder_options/)
+  `use_experimental_inference` [build option](https://drift.simonbinder.eu/docs/advanced-features/builder_options/)
 - Web: New `initializer` parameter to create the database when it doesn't exist
 
 ## 2.2.0
@@ -268,7 +268,7 @@ Automated migration tooling exists! See https://drift.simonbinder.eu/name for de
   ```
 - Support the `json1` and `fts5` extensions! Using them also requires version 2.2 of `moor_generator`
   and they require `moor_ffi`. For details, see
-  the [documentation](https://moor.simonbinder.eu/docs/using-sql/extensions/).
+  the [documentation](https://drift.simonbinder.eu/docs/using-sql/extensions/).
 - Standardized behavior of batches in transactions across backends
 - Introduced `OrderingTerm.asc` and `OrderingTerm.desc` factories to construct ordering terms more easily
 
@@ -291,7 +291,7 @@ Automated migration tooling exists! See https://drift.simonbinder.eu/name for de
     - Arithmetic: New `+`, `-`, `*` and `/` operators for int and double sql expressions
     - New `+` operator for string concatenation
 - Fix crash when `customStatement` is the first operation used on a
-  database ([#199](https://github.com/simolus3/moor/issues/199))
+  database ([#199](https://github.com/simolus3/drift/issues/199))
 - Allow transactions inside a `beforeOpen` callback
 - New `batch` method on generated databases to execute multiple queries in a single batch
 - Experimental support to run moor on a background isolate
@@ -310,7 +310,7 @@ Automated migration tooling exists! See https://drift.simonbinder.eu/name for de
 - __Breaking__: Remove the type parameter from `Insertable.createCompanion` (it was declared as an internal method)
 
 __2.0.1+1__: Fix crash when `customStatement` is the first operation used on a database
-([#199](https://github.com/simolus3/moor/issues/199))
+([#199](https://github.com/simolus3/drift/issues/199))
 
 ## 2.0.0
 
@@ -378,7 +378,7 @@ new class for that, we simply return the value directly.
 #### Experimental ffi support
 
 We released an experimental version of moor built on top of `dart:ffi`. It works cross-platform and is much, much faster
-than `moor_flutter`. It you want to try it out, read the docs [here](https://moor.simonbinder.eu/docs/other-engines/vm/)
+than `moor_flutter`. It you want to try it out, read the docs [here](https://drift.simonbinder.eu/docs/other-engines/vm/)
 .
 
 ### Minor changes
@@ -432,12 +432,12 @@ than `moor_flutter`. It you want to try it out, read the docs [here](https://moo
 
 ## 1.7.0
 
-- Support custom columns via type converters. See the [docs](https://moor.simonbinder.eu/type_converters)
+- Support custom columns via type converters. See the [docs](https://drift.simonbinder.eu/type_converters)
   for details on how to use this feature.
 - Transactions now roll back when not completed successfully, they also rethrow the exception to make debugging easier.
 - New `backends` api, making it easier to write database drivers that work with moor. Apart from
   `moor_flutter`, new experimental backends can be checked out from git:
-    1. `encrypted_moor`: An encrypted moor database: https://github.com/simolus3/moor/tree/develop/extras/encryption
+    1. `encrypted_moor`: An encrypted moor database: https://github.com/simolus3/drift/tree/develop/extras/encryption
 - The compiled sql feature is no longer experimental and will stay stable until a major version bump
 - New, experimental support for `.moor` files! Instead of declaring your tables in Dart, you can choose to declare them
   with sql by writing the `CREATE TABLE` statement in a `.moor` file. You can then use these tables in the database and
@@ -446,7 +446,7 @@ than `moor_flutter`. It you want to try it out, read the docs [here](https://moo
 
 ## 1.6.0
 
-- Experimental web support! See [the documentation](https://moor.simonbinder.eu/web) for details.
+- Experimental web support! See [the documentation](https://drift.simonbinder.eu/web) for details.
 - Make transactions easier to use: Thanks to some Dart async magic, you no longer need to run queries on the transaction
   explicitly. This
   ```dart
@@ -470,7 +470,7 @@ than `moor_flutter`. It you want to try it out, read the docs [here](https://moo
   (`SELECT * FROM entries WHERE id IN ?`)
 - Support `COLLATE` expressions.
 - Date time columns are now comparable
-- The `StringType` now supports arbitrary data from sqlite ([#70](https://github.com/simolus3/moor/pull/70)).
+- The `StringType` now supports arbitrary data from sqlite ([#70](https://github.com/simolus3/drift/pull/70)).
   Thanks, [knaeckeKami](https://github.com/knaeckeKami)!
 - Bugfixes related to stream queries and `LIMIT` clauses.
 
@@ -506,20 +506,20 @@ default `Value.absent()`.
 Don't worry, all your existing code will continue to work, this change is fully backwards compatible. You might get
 analyzer warnings about missing required fields. The migration to update companions will fix that. Replacing normal
 classes with their update companions is simple and the only thing needed to fix that.
-The [documentation](https://moor.simonbinder.eu/queries/#updates-and-deletes)
+The [documentation](https://drift.simonbinder.eu/queries/#updates-and-deletes)
 has been updated to reflect this. If you have additional questions, feel free to
-[create an issue](https://github.com/simolus3/moor/issues/new).
+[create an issue](https://github.com/simolus3/drift/issues/new).
 
 ### Compiled sql queries
 
 Experimental support for compile time custom statements. Sounds super boring, but it actually gives you a fluent way to
 write queries in pure sql. The moor generator will figure out what your queries return and automatically generate the
 boring mapping part. Head on to
-[the documentation](https://moor.simonbinder.eu/queries/custom) to find out how to use this new feature.
+[the documentation](https://drift.simonbinder.eu/queries/custom) to find out how to use this new feature.
 
 Please note that this feature is in an experimental state: Expect minor, but breaking changes in the API and in the
 generated code. Also, if you run into any issues with this feature,
-[reporting them](https://github.com/simolus3/moor/issues/new) would be super appreciated.
+[reporting them](https://github.com/simolus3/drift/issues/new) would be super appreciated.
 
 ## 1.4.0
 
diff --git a/moor/README.md b/moor/README.md
index 6f91dc7b..91c9e371 100644
--- a/moor/README.md
+++ b/moor/README.md
@@ -5,7 +5,7 @@ This package will continue to be supported for a while, but we encourage users t
 Automated tooling to help you make the switch is available! For more information, see [the documentation](https://drift.simonbinder.eu/name/).
 Thank you for understanding!
 
-__To start using Drift, read our detailed [docs](https://moor.simonbinder.eu/docs/getting-started/).__
+__To start using Drift, read our detailed [docs](https://drift.simonbinder.eu/docs/getting-started/).__
 
 ## Proudly Sponsored by [Stream 💙](https://getstream.io/chat/flutter/tutorial/?utm_source=Github&utm_medium=Github_Repo_Content_Ad&utm_content=Developer&utm_campaign=Github_Jan2022_FlutterChat&utm_term=moor)
 
diff --git a/moor/lib/extensions/json1.dart b/moor/lib/extensions/json1.dart
index f5ddcb5d..78f46c3f 100644
--- a/moor/lib/extensions/json1.dart
+++ b/moor/lib/extensions/json1.dart
@@ -3,7 +3,7 @@
 ///
 /// Note that the json1 extension might not be available on all runtimes. In
 /// particular, it can only work reliably on Android when using the
-/// [moor_ffi](https://moor.simonbinder.eu/docs/other-engines/vm/) and it might
+/// [moor_ffi](https://drift.simonbinder.eu/docs/other-engines/vm/) and it might
 /// not work on older iOS versions.
 @experimental
 @moorDeprecated
diff --git a/moor/lib/ffi.dart b/moor/lib/ffi.dart
index abcde67f..e1e1851e 100644
--- a/moor/lib/ffi.dart
+++ b/moor/lib/ffi.dart
@@ -4,7 +4,7 @@
 /// when running your app. For mobile Flutter apps, you can simply depend on the
 /// `sqlite3_flutter_libs` package to ship the latest sqlite3 version with your
 /// app.
-/// For more information other platforms, see [other engines](https://moor.simonbinder.eu/docs/other-engines/vm/).
+/// For more information other platforms, see [other engines](https://drift.simonbinder.eu/docs/other-engines/vm/).
 @moorDeprecated
 library moor.ffi;
 
diff --git a/moor/lib/isolate.dart b/moor/lib/isolate.dart
index 283a23d7..fbc2884a 100644
--- a/moor/lib/isolate.dart
+++ b/moor/lib/isolate.dart
@@ -23,7 +23,7 @@ export 'package:drift/isolate.dart';
 ///
 /// See also:
 /// - [Isolate], for general information on multi threading in Dart.
-/// - The [detailed documentation](https://moor.simonbinder.eu/docs/advanced-features/isolates),
+/// - The [detailed documentation](https://drift.simonbinder.eu/docs/advanced-features/isolates),
 ///   which provides example codes on how to use this api.
 @pragma('moor2drift', 'DriftIsolate')
 typedef MoorIsolate = DriftIsolate;
diff --git a/moor/lib/moor.dart b/moor/lib/moor.dart
index 8a556009..fb3fc499 100644
--- a/moor/lib/moor.dart
+++ b/moor/lib/moor.dart
@@ -54,7 +54,7 @@ typedef UseMoor = DriftDatabase;
 /// class.
 ///
 /// See also:
-/// - https://moor.simonbinder.eu/daos/
+/// - https://drift.simonbinder.eu/daos/
 @pragma('moor2drift', 'DriftAccessor')
 @moorDeprecated
 typedef UseDao = DriftAccessor;
diff --git a/moor/lib/moor_web.dart b/moor/lib/moor_web.dart
index ed51a073..02713caf 100644
--- a/moor/lib/moor_web.dart
+++ b/moor/lib/moor_web.dart
@@ -1,6 +1,6 @@
 /// A version of moor that runs on the web by using [sql.js](https://github.com/sql-js/sql.js)
 /// You manually need to include that library into your website to use the
-/// web version of moor. See [the documentation](https://moor.simonbinder.eu/web)
+/// web version of moor. See [the documentation](https://drift.simonbinder.eu/web)
 /// for a more detailed instruction.
 @experimental
 @moorDeprecated
diff --git a/moor/lib/remote.dart b/moor/lib/remote.dart
index c57bed7b..cbb95a89 100644
--- a/moor/lib/remote.dart
+++ b/moor/lib/remote.dart
@@ -44,7 +44,7 @@
 /// For an example of a channel implementation, you could study the
 /// implementation of the `package:moor/isolate.dart` library, which uses this
 /// library to implement its apis.
-/// The [web](https://moor.simonbinder.eu/web/) documentation on the website
+/// The [web](https://drift.simonbinder.eu/web/) documentation on the website
 /// contains another implementation based on web workers that might be of
 /// interest.
 @experimental
diff --git a/moor/pubspec.yaml b/moor/pubspec.yaml
index f789ef83..0b81ca89 100644
--- a/moor/pubspec.yaml
+++ b/moor/pubspec.yaml
@@ -1,9 +1,9 @@
 name: moor
 description: Moor has been renamed to Drift.
 version: 4.6.1+2
-repository: https://github.com/simolus3/moor
-homepage: https://moor.simonbinder.eu/
-issue_tracker: https://github.com/simolus3/moor/issues
+repository: https://github.com/simolus3/drift
+homepage: https://drift.simonbinder.eu/
+issue_tracker: https://github.com/simolus3/drift/issues
 
 environment:
   sdk: '>=2.13.0 <3.0.0'
diff --git a/moor_flutter/CHANGELOG.md b/moor_flutter/CHANGELOG.md
index 51cd0430..c9f6ede2 100644
--- a/moor_flutter/CHANGELOG.md
+++ b/moor_flutter/CHANGELOG.md
@@ -17,7 +17,7 @@ Support `moor` version 3.0. To learn what's new, head over to [its changelog](ht
 
 ## 2.1.1
 
-- Fix `runCustom` not using the provided variables ([#406](https://github.com/simolus3/moor/issues/406))
+- Fix `runCustom` not using the provided variables ([#406](https://github.com/simolus3/drift/issues/406))
 
 ## 2.1.0
 
@@ -26,16 +26,16 @@ Support `moor` version 3.0. To learn what's new, head over to [its changelog](ht
 
 ## 2.0.0
 See the changelog of [moor](https://pub.dev/packages/moor#-changelog-tab-) for details,
-or check out an overview of new features [here](https://moor.simonbinder.eu/v2)
+or check out an overview of new features [here](https://drift.simonbinder.eu/v2)
 
 ## 1.7.0
-- Support custom columns via type converters. See the [docs](https://moor.simonbinder.eu/type_converters)
+- Support custom columns via type converters. See the [docs](https://drift.simonbinder.eu/type_converters)
 for details on how to use this feature.
 - Transactions now roll back when not completed successfully, they also rethrow the exception
 to make debugging easier.
 - New `backends` api, making it easier to write database drivers that work with moor. Apart from
 `moor_flutter`, new experimental backends can be checked out from git:
-  1. `encrypted_moor`: An encrypted moor database: https://github.com/simolus3/moor/tree/develop/extras/encryption
+  1. `encrypted_moor`: An encrypted moor database: https://github.com/simolus3/drift/tree/develop/extras/encryption
 - The compiled sql feature is no longer experimental and will stay stable until a major version bump
 - New, experimental support for `.moor` files! Instead of declaring your tables in Dart, you can
   choose to declare them with sql by writing the `CREATE TABLE` statement in a `.moor` file.
@@ -44,7 +44,7 @@ to make debugging easier.
   might be some hiccups. Please report any issues you run into.
 
 ## 1.6.0
-- Experimental web support! See [the documentation](https://moor.simonbinder.eu/web) for details.
+- Experimental web support! See [the documentation](https://drift.simonbinder.eu/web) for details.
 - Make transactions easier to use: Thanks to some Dart async magic, you no longer need to run
   queries on the transaction explicitly. This
   ```dart
@@ -68,7 +68,7 @@ to make debugging easier.
  (`SELECT * FROM entries WHERE id IN ?`)
 - Support `COLLATE` expressions.
 - Date time columns are now comparable
-- The `StringType` now supports arbitrary data from sqlite ([#70](https://github.com/simolus3/moor/pull/70)).
+- The `StringType` now supports arbitrary data from sqlite ([#70](https://github.com/simolus3/drift/pull/70)).
   Thanks, [knaeckeKami](https://github.com/knaeckeKami)!
 - Bugfixes related to stream queries and `LIMIT` clauses.
 
@@ -97,18 +97,18 @@ default `Value.absent()`.
 Don't worry, all your existing code will continue to work, this change is fully backwards
 compatible. You might get analyzer warnings about missing required fields. The migration to
 update companions will fix that. Replacing normal classes with their update companions is simple
-and the only thing needed to fix that. The [documentation](https://moor.simonbinder.eu/queries/#updates-and-deletes)
+and the only thing needed to fix that. The [documentation](https://drift.simonbinder.eu/queries/#updates-and-deletes)
 has been updated to reflect this. If you have additional questions, feel free to 
-[create an issue](https://github.com/simolus3/moor/issues/new).
+[create an issue](https://github.com/simolus3/drift/issues/new).
 ### Compiled sql queries
 Experimental support for compile time custom statements. Sounds super boring, but it
 actually gives you a fluent way to write queries in pure sql. The moor generator will figure
 out what your queries return and automatically generate the boring mapping part. Head on to
-[the documentation](https://moor.simonbinder.eu/queries/custom) to find out how to use this new feature.
+[the documentation](https://drift.simonbinder.eu/queries/custom) to find out how to use this new feature.
   
 Please note that this feature is in an experimental state: Expect minor, but breaking changes
 in the API and in the generated code. Also, if you run into any issues with this feature, 
-[reporting them](https://github.com/simolus3/moor/issues/new) would be super appreciated.
+[reporting them](https://github.com/simolus3/drift/issues/new) would be super appreciated.
 
 ## 1.4.0
 - Added the `RealColumn`, which stores floating point values
diff --git a/moor_flutter/README.md b/moor_flutter/README.md
index 0f9b9c85..9b55756e 100644
--- a/moor_flutter/README.md
+++ b/moor_flutter/README.md
@@ -19,12 +19,12 @@ provide helpful and descriptive lints.
 
 With moor, persistence on Flutter is fun!
 
-__To start using moor, read our detailed [docs](https://moor.simonbinder.eu/docs/getting-started/).__
+__To start using moor, read our detailed [docs](https://drift.simonbinder.eu/docs/getting-started/).__
 
 If you have any questions, feedback or ideas, feel free to [create an
-issue](https://github.com/simolus3/moor/issues/new). If you enjoy this
-project, I'd appreciate your [🌟 on GitHub](https://github.com/simolus3/moor/).
+issue](https://github.com/simolus3/drift/issues/new). If you enjoy this
+project, I'd appreciate your [🌟 on GitHub](https://github.com/simolus3/drift/).
 
 ## For the web
 For information to use this library on the web (including Flutter web), follow the 
-instructions [here](https://moor.simonbinder.eu/web). Keep in mind that web support is still experimental.
+instructions [here](https://drift.simonbinder.eu/web). Keep in mind that web support is still experimental.
diff --git a/moor_flutter/lib/moor_flutter.dart b/moor_flutter/lib/moor_flutter.dart
index 80637a73..7b9ae970 100644
--- a/moor_flutter/lib/moor_flutter.dart
+++ b/moor_flutter/lib/moor_flutter.dart
@@ -1,7 +1,7 @@
 /// Flutter implementation for the moor database. This library merely provides
 /// a thin level of abstraction between the
 /// [sqflite](https://pub.dev/packages/sqflite) library and
-/// [moor](https://github.com/simolus3/moor)
+/// [moor](https://github.com/simolus3/drift)
 library moor_flutter;
 
 import 'dart:async';
diff --git a/moor_flutter/pubspec.lock b/moor_flutter/pubspec.lock
index 9cbf6f8b..47ae2c05 100644
--- a/moor_flutter/pubspec.lock
+++ b/moor_flutter/pubspec.lock
@@ -7,7 +7,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.8.1"
+    version: "2.8.2"
   boolean_selector:
     dependency: transitive
     description:
@@ -21,7 +21,7 @@ packages:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   charcode:
     dependency: transitive
     description:
@@ -80,7 +80,14 @@ packages:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.10"
+    version: "0.12.11"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.3"
   meta:
     dependency: transitive
     description:
@@ -183,7 +190,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.2"
+    version: "0.4.8"
   typed_data:
     dependency: transitive
     description:
@@ -197,7 +204,7 @@ packages:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
 sdks:
-  dart: ">=2.12.0 <3.0.0"
+  dart: ">=2.14.0 <3.0.0"
   flutter: ">=1.24.0-10"
diff --git a/moor_flutter/pubspec.yaml b/moor_flutter/pubspec.yaml
index 12c43ab6..694e5fd4 100644
--- a/moor_flutter/pubspec.yaml
+++ b/moor_flutter/pubspec.yaml
@@ -1,9 +1,9 @@
 name: moor_flutter
 description: Flutter implementation of moor, a safe and reactive persistence library for Dart applications
 version: 4.1.0-dev
-repository: https://github.com/simolus3/moor
-homepage: https://moor.simonbinder.eu/
-issue_tracker: https://github.com/simolus3/moor/issues
+repository: https://github.com/simolus3/drift
+homepage: https://drift.simonbinder.eu/
+issue_tracker: https://github.com/simolus3/drift/issues
 
 environment:
   sdk: '>=2.12.0 <3.0.0'
diff --git a/moor_generator/CHANGELOG.md b/moor_generator/CHANGELOG.md
index 32024544..0819e198 100644
--- a/moor_generator/CHANGELOG.md
+++ b/moor_generator/CHANGELOG.md
@@ -117,7 +117,7 @@ for all the new features.
 ## 2.2.0
 
 - Experimental new CLI tool (`pub run moor_generator`). Not useful at the moment
-- Support inheritance when defining daos ([#285](https://github.com/simolus3/moor/issues/285))
+- Support inheritance when defining daos ([#285](https://github.com/simolus3/drift/issues/285))
 - Improve robustness and error messages, many bug fixes
 
 ## 2.1.1
@@ -156,7 +156,7 @@ for all the new features.
 
 - Support type converters that were introduced in moor 1.7
 - Support parsing and generating code for `.moor` files (
-  see [docs](https://moor.simonbinder.eu/docs/using-sql/custom_tables/)).
+  see [docs](https://drift.simonbinder.eu/docs/using-sql/custom_tables/)).
 
 ## 1.6.0+2
 
diff --git a/moor_generator/README.md b/moor_generator/README.md
index 8e31765a..c7820b96 100644
--- a/moor_generator/README.md
+++ b/moor_generator/README.md
@@ -8,4 +8,4 @@ Thanks yor your understanding!
 This library contains the generator that turns your `Table` classes from moor
 into database code.
 
-Please see the homepage of [moor](https://moor.simonbinder.eu/) for details on how to use this package.
\ No newline at end of file
+Please see the homepage of [moor](https://drift.simonbinder.eu/) for details on how to use this package.
\ No newline at end of file
diff --git a/moor_generator/pubspec.yaml b/moor_generator/pubspec.yaml
index 94a672d1..483dcaa4 100644
--- a/moor_generator/pubspec.yaml
+++ b/moor_generator/pubspec.yaml
@@ -1,9 +1,9 @@
 name: moor_generator
 description: Moor has been renamed to Drift.
 version: 4.6.1
-repository: https://github.com/simolus3/moor
-homepage: https://moor.simonbinder.eu/
-issue_tracker: https://github.com/simolus3/moor/issues
+repository: https://github.com/simolus3/drift
+homepage: https://drift.simonbinder.eu/
+issue_tracker: https://github.com/simolus3/drift/issues
 
 environment:
   sdk: '>=2.12.0 <3.0.0'
diff --git a/sqlparser/pubspec.yaml b/sqlparser/pubspec.yaml
index c22bd68c..2258e4b7 100644
--- a/sqlparser/pubspec.yaml
+++ b/sqlparser/pubspec.yaml
@@ -1,9 +1,9 @@
 name: sqlparser
 description: Parses sqlite statements and performs static analysis on them
 version: 0.21.0-dev
-homepage: https://github.com/simolus3/moor/tree/develop/sqlparser
-#homepage: https://moor.simonbinder.eu/
-issue_tracker: https://github.com/simolus3/moor/issues
+homepage: https://github.com/simolus3/drift/tree/develop/sqlparser
+#homepage: https://drift.simonbinder.eu/
+issue_tracker: https://github.com/simolus3/drift/issues
 
 environment:
   sdk: '>=2.12.0 <3.0.0'
diff --git a/sqlparser/test/analysis/errors/create_table_errors_test.dart b/sqlparser/test/analysis/errors/create_table_errors_test.dart
index 1d2ab803..edf1ffb5 100644
--- a/sqlparser/test/analysis/errors/create_table_errors_test.dart
+++ b/sqlparser/test/analysis/errors/create_table_errors_test.dart
@@ -38,7 +38,7 @@ void main() {
     );
 
     test('with a type that is only valid in drift mode', () {
-      // https://github.com/simolus3/moor/discussions/1651
+      // https://github.com/simolus3/drift/discussions/1651
       engineInDriftMode
           .analyze('CREATE TABLE a (c IS_DATETIME, b DECIMAL, c REAL) STRICT;')
           .expectNoError();
diff --git a/sqlparser/test/analysis/regression_test.dart b/sqlparser/test/analysis/regression_test.dart
index f724e8b0..983b4c9a 100644
--- a/sqlparser/test/analysis/regression_test.dart
+++ b/sqlparser/test/analysis/regression_test.dart
@@ -5,7 +5,7 @@ import 'data.dart';
 
 void main() {
   test('regression test for #917', () {
-    // Test for https://github.com/simolus3/moor/issues/917
+    // Test for https://github.com/simolus3/drift/issues/917
     final engine = SqlEngine()
       ..registerTableFromSql('CREATE TABLE Shops (id INTEGER);')
       ..registerTableFromSql(
@@ -34,7 +34,7 @@ void main() {
   });
 
   test('regression test for #1188', () {
-    // Test for https://github.com/simolus3/moor/issues/1188
+    // Test for https://github.com/simolus3/drift/issues/1188
     final engine = SqlEngine(EngineOptions(useDriftExtensions: true))
       ..registerTableFromSql('''
         CREATE TABLE IF NOT EXISTS "employees" (
@@ -84,7 +84,7 @@ void main() {
   });
 
   test('regression test for #1234', () {
-    // https://github.com/simolus3/moor/issues/1234#issuecomment-853270925
+    // https://github.com/simolus3/drift/issues/1234#issuecomment-853270925
     final engine = SqlEngine(EngineOptions(useDriftExtensions: true))
       ..registerTableFromSql('''
         CREATE TABLE inboxes (
@@ -115,7 +115,7 @@ void main() {
   });
 
   test('regression test for #1096', () {
-    // https://github.com/simolus3/moor/issues/1096#issuecomment-931378474
+    // https://github.com/simolus3/drift/issues/1096#issuecomment-931378474
     final engine = SqlEngine(
         EngineOptions(useDriftExtensions: true, version: SqliteVersion.v3_35))
       ..registerTableFromSql('''
diff --git a/sqlparser/test/analysis/types2/misc_cases_test.dart b/sqlparser/test/analysis/types2/misc_cases_test.dart
index 6e45c379..7d0534fe 100644
--- a/sqlparser/test/analysis/types2/misc_cases_test.dart
+++ b/sqlparser/test/analysis/types2/misc_cases_test.dart
@@ -94,7 +94,7 @@ WITH RECURSIVE
   });
 
   test('concatenation is nullable when any part is', () {
-    // https://github.com/simolus3/moor/issues/1719
+    // https://github.com/simolus3/drift/issues/1719
 
     final engine = SqlEngine()
       ..registerTableFromSql('CREATE TABLE foobar (foo TEXT, bar TEXT);');
diff --git a/sqlparser/test/parser/create_table_test.dart b/sqlparser/test/parser/create_table_test.dart
index 59cf8595..25a9c004 100644
--- a/sqlparser/test/parser/create_table_test.dart
+++ b/sqlparser/test/parser/create_table_test.dart
@@ -301,7 +301,7 @@ void main() {
   });
 
   test('parses DEFAULT with a negative literal', () {
-    // regression test for https://github.com/simolus3/moor/discussions/1550
+    // regression test for https://github.com/simolus3/drift/discussions/1550
     testStatement(
       'CREATE TABLE a (b INTEGER NOT NULL DEFAULT -1);',
       CreateTableStatement(
diff --git a/sqlparser/test/parser/moor_file_test.dart b/sqlparser/test/parser/moor_file_test.dart
index 53b50fb7..6357013b 100644
--- a/sqlparser/test/parser/moor_file_test.dart
+++ b/sqlparser/test/parser/moor_file_test.dart
@@ -161,7 +161,7 @@ END;
   });
 
   test("reports error when the statement can't be parsed", () {
-    // regression test for https://github.com/simolus3/moor/issues/280#issuecomment-570789454
+    // regression test for https://github.com/simolus3/drift/issues/280#issuecomment-570789454
     final parsed = SqlEngine(EngineOptions(useDriftExtensions: true))
         .parseDriftFile('name: NSERT INTO foo DEFAULT VALUES;');