diff --git a/Cargo.lock b/Cargo.lock
index 5e953f6..a0eb3b8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -318,7 +318,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "gh-stack"
+name = "git-stack"
 version = "0.3.0"
 dependencies = [
  "clap",
diff --git a/Cargo.toml b/Cargo.toml
index 22c0639..3a45930 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
-name = "gh-stack"
+name = "git-stack"
 version = "0.3.0"
-authors = ["Timothy Andrew <mail@timothyandrew.net>, Luis Ball <luqven@gmail.com>"]
+authors = ["Timothy Andrew <mail@timothyandrew.net>, Luis Ball <luqven@gmail.com>, Olivier 'reivilibre' <olivier@librepush.net>"]
 license = "MIT"
-repository = "https://github.com/luqven/gh-stack"
+repository = "https://git.emunest.net/reivilibre/git-stack"
 readme = "README.md"
 edition = "2021"
 description = "Manage stacked PR workflows on Github"
diff --git a/README.md b/README.md
index 793a535..7a7acde 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Wishes:
 - [ ] make it play nicely with a workflow that uses 'squash merges' for PRs
 - [ ] preserve info about bases/stack even after first PRs have been merged
 - [ ] alternative to autorebase that doesn't force-push unchanged PRs (thus invalidating reviews)
-- [ ] rename to git-stack so that we can eventually support other code forges and also fit into git aliases more easily. 
+- [x] rename to git-stack so that we can eventually support other code forges and also fit into git aliases more easily. 
 
 Potential wishes:
 
diff --git a/src/main.rs b/src/main.rs
index 34287b5..f032d10 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -6,11 +6,11 @@ use std::env;
 use std::error::Error;
 use std::rc::Rc;
 
-use gh_stack::api::PullRequest;
-use gh_stack::graph::FlatDep;
-use gh_stack::util::loop_until_confirm;
-use gh_stack::Credentials;
-use gh_stack::{api, git, graph, markdown, persist};
+use git_stack::api::PullRequest;
+use git_stack::graph::FlatDep;
+use git_stack::util::loop_until_confirm;
+use git_stack::Credentials;
+use git_stack::{api, git, graph, markdown, persist};
 
 fn clap<'a, 'b>() -> App<'a, 'b> {
     let identifier = Arg::with_name("identifier")
@@ -93,7 +93,7 @@ fn clap<'a, 'b>() -> App<'a, 'b> {
         .arg(exclude.clone())
         .arg(identifier.clone());
 
-    let app = App::new("gh-stack")
+    let app = App::new("git-stack")
         .setting(AppSettings::SubcommandRequiredElseHelp)
         .setting(AppSettings::DisableVersion)
         .setting(AppSettings::VersionlessSubcommands)