diff --git a/Cargo.lock b/Cargo.lock
index 2316ada..a305759 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1477,7 +1477,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0"
 
 [[package]]
-name = "svurl-service"
+name = "svurl-resolver"
 version = "0.1.0"
 dependencies = [
  "cargo-deb",
diff --git a/Cargo.toml b/Cargo.toml
index ef5bce3..42823b2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
-name = "svurl-service"
+name = "svurl-resolver"
 version = "0.1.0"
 edition = "2018"
 
 authors = ["Sargun Vohra <sargun.vohra@gmail.com>"]
-description = "Personal shortlinking and CLI-style bookmarks backend"
+description = "Personal CLI-style bookmarks backend"
 readme = "README.md"
 homepage = "https://svurl.co/"
-repository = "https://github.com/sargunv/svurl-service.git"
+repository = "https://github.com/sargunv/svurl.git"
 license = "Apache-2.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -23,7 +23,7 @@ cargo-deb = "1.32.0"
 
 [package.metadata.deb]
 maintainer-scripts = "debian/"
-extended-description = "Backend endpoint for a CLI-style bookmark and shortlinking service, similar to http://www.bunny1.org/."
+extended-description = "Backend endpoint for a CLI-style bookmarks service, similar to http://www.bunny1.org/."
 
 [package.metadata.deb.systemd-units]
 enable = true
diff --git a/README.md b/README.md
index 337fc8b..d6732e2 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Svurl Service
+# Svurl
 
 Backend endpoint for a CLI-style bookmark service, similar to http://www.bunny1.org/.
 
@@ -16,12 +16,12 @@ curl -L https://packagecloud.io/sargunv/public/gpgkey | sudo apt-key add -
 echo 'deb https://packagecloud.io/sargunv/public/any/ any main' | sudo tee -a /etc/apt/sources.list
 
 # Update your sources and install
-sudo apt update && sudo apt install svurl-service
+sudo apt update && sudo apt install svurl-resolver
 ```
 
-Alternatively, download the `.deb` package for your system from [Github Releases](https://github.com/sargunv/svurl-service/releases/latest) and install it with `dpkg`.
+Alternatively, download the `.deb` package for your system from [Github Releases](https://github.com/sargunv/svurl/releases/latest) and install it with `dpkg`.
 
-To override settings like the port, run `sudo systemctl edit svurl-service`, set [applicable environment variables](https://rocket.rs/v0.4/guide/configuration/#environment-variables), and run `sudo systemctl restart svurl-service`. For example:
+To override settings like the port, run `sudo systemctl edit svurl-resolver`, set [applicable environment variables](https://rocket.rs/v0.4/guide/configuration/#environment-variables), and run `sudo systemctl restart svurl-resolver`. For example:
 
 ```
 [Service]
diff --git a/config.kdl b/config.kdl
index 98b52a2..991f823 100644
--- a/config.kdl
+++ b/config.kdl
@@ -23,11 +23,11 @@ command "github" "gh" {
         regex "https://github.com/marketplace?query={2}&type={1}" \
             "^--(apps|actions)\\s+(.*)$"
 
-        // open a specific github user or repo ("gh sargunv/svurl-service")
+        // open a specific github user or repo ("gh sargunv/svurl")
         regex "https://github.com{/owner}{/repo}" \
             "^(?P<owner>[-a-zA-Z0-9]+)/(?P<repo>[-a-zA-Z0-9]+)?$"
 
-        // open a specific github issue (gh sargunv/svurl-service#123")
+        // open a specific github issue (gh sargunv/svurl#123")
         regex "https://github.com{/owner}{/repo}/issues{/issue}" \
             "^(?P<owner>[-a-zA-Z0-9]+)/(?P<repo>[-a-zA-Z0-9]+)#(?P<issue>[0-9]+)$"
         noargs "https://github.com"
@@ -40,8 +40,8 @@ command "github" "gh" {
         accept "gh --actions upload artifact" "https://github.com/marketplace?query=upload%20artifact&type=actions"
         accept "gh --apps gitpod" "https://github.com/marketplace?query=gitpod&type=apps"
         accept "gh sargunv/" "https://github.com/sargunv"
-        accept "gh sargunv/svurl-service" "https://github.com/sargunv/svurl-service"
-        accept "gh sargunv/svurl-service#123" "https://github.com/sargunv/svurl-service/issues/123"
+        accept "gh sargunv/svurl" "https://github.com/sargunv/svurl"
+        accept "gh sargunv/svurl#1" "https://github.com/sargunv/svurl/issues/1"
     }
 }
 
diff --git a/debian/service b/debian/service
index e72ae4a..0e90e6f 100644
--- a/debian/service
+++ b/debian/service
@@ -1,10 +1,10 @@
 [Unit]
-Description=Svurl Service
+Description=Svurl Resolver
 After=network-online.target
 
 [Service]
 Environment="ROCKET_ADDRESS=0.0.0.0"
-ExecStart=/usr/bin/svurl-service
+ExecStart=/usr/bin/svurl-resolver
 Restart=always
 
 [Install]