diff --git a/README.md b/README.md
index 480d4f56..f1966eac 100644
--- a/README.md
+++ b/README.md
@@ -125,7 +125,7 @@ yarn create eth-app my-eth-app --template compound
 - **Aimed at Experience Architects**: As Kames CG argues in [Ethereum Growth's Problem](https://medium.com/horizin/ethereums-growth-problem-5cab86734917), the Ethereum ecosystem is in
   a much greater need for top-notch product creators, not smart contract developers. Create Eth App does
   not enable a smart contract development environment, expecting you to import your own ABIs or build on top of
-  an established protocol like [Maker](https://makerdao.com), [Compound](https://compound.finance/) or [Sablier](https://sablier.finance)
+  an established protocol like [Maker](https://makerdao.com), [Compound](https://compound.finance/) or [Sablier](https://sablier.com)
 
 - **Not Reinventing The Wheel**: Under the hood, you use Create React App, one of the most popular and battle-tested frontend development
   environments.
diff --git a/templates/react/default/packages/subgraph/subgraph.yaml b/templates/react/default/packages/subgraph/subgraph.yaml
index edf60273..85519efa 100644
--- a/templates/react/default/packages/subgraph/subgraph.yaml
+++ b/templates/react/default/packages/subgraph/subgraph.yaml
@@ -1,6 +1,6 @@
 specVersion: 0.0.4
 description: Subgraph that indexes the blockchain data
-repository: https://github.com/sablierhq/sablier-subgraph
+repository: https://github.com/sablier-labs/sablier-subgraph
 schema:
   file: ./schema.graphql
 dataSources:
diff --git a/templates/react/sablier-v1/README.md.ctx b/templates/react/sablier-v1/README.md.ctx
index 2b058498..e97c0946 100644
--- a/templates/react/sablier-v1/README.md.ctx
+++ b/templates/react/sablier-v1/README.md.ctx
@@ -1,11 +1,11 @@
 {
-  "description": "Sablier is the protocol for real-time finance on the Ethereum blockchain. Just like you can stream movies on Netflix or music on Spotify, so you can stream money on Sablier. Read more about it in the [official documentation](https://docs.sablier.finance/).",
+  "description": "Sablier is the protocol for real-time finance on the Ethereum blockchain. Just like you can stream movies on Netflix or music on Spotify, so you can stream money on Sablier. Read more about it in the [official documentation](https://docs.sablier.com/).",
   "packages": [
     "[contracts](/packages/contracts)",
     "[react-app](/packages/react-app)"
   ],
   "subgraphName": "Sablier v1",
-  "subgraphUrl": "https://thegraph.com/explorer/subgraph/sablierhq/sablier",
+  "subgraphUrl": "https://thegraph.com/explorer/subgraph/sablier-labs/sablier",
   "templateName": "Sablier v1",
   "templateUrl": "https://github.com/paulrberg/create-eth-app/tree/develop/templates/react/sablier-v1"
 }
diff --git a/templates/react/sablier-v1/packages/react-app/src/App.js.ctx b/templates/react/sablier-v1/packages/react-app/src/App.js.ctx
index fa2ca2b7..464ec617 100644
--- a/templates/react/sablier-v1/packages/react-app/src/App.js.ctx
+++ b/templates/react/sablier-v1/packages/react-app/src/App.js.ctx
@@ -14,7 +14,7 @@
   ],
   "learn": {
     "name": "Sablier v1",
-    "url": "https://docs.sablier.finance/"
+    "url": "https://docs.sablier.com/"
   },
   "subgraphQuery": {
     "key": "streams",
diff --git a/templates/react/sablier-v1/packages/react-app/src/graphql/subgraph.js b/templates/react/sablier-v1/packages/react-app/src/graphql/subgraph.js
index fd5513cb..8db197fe 100644
--- a/templates/react/sablier-v1/packages/react-app/src/graphql/subgraph.js
+++ b/templates/react/sablier-v1/packages/react-app/src/graphql/subgraph.js
@@ -1,6 +1,6 @@
 import { gql } from "@apollo/client";
 
-// See more example queries on https://thegraph.com/explorer/subgraph/sablierhq/sablier
+// See more example queries on https://thegraph.com/explorer/subgraph/sablier-labs/sablier
 const GET_STREAMS = gql`
   {
     streams(first: 10, orderBy: timestamp, orderDirection: desc) {
diff --git a/templates/react/sablier-v1/packages/react-app/src/index.js.ctx b/templates/react/sablier-v1/packages/react-app/src/index.js.ctx
index 51507f7b..9089354c 100644
--- a/templates/react/sablier-v1/packages/react-app/src/index.js.ctx
+++ b/templates/react/sablier-v1/packages/react-app/src/index.js.ctx
@@ -1,6 +1,6 @@
 {
   "subgraph": {
     "comment": "// This is the official Sablier v1 subgraph. You can replace it with your own, if you need to.",
-    "url": "https://api.thegraph.com/subgraphs/name/sablierhq/sablier"
+    "url": "https://api.thegraph.com/subgraphs/name/sablier-labs/sablier"
   }
 }
diff --git a/templates/vue/default/packages/subgraph/subgraph.yaml b/templates/vue/default/packages/subgraph/subgraph.yaml
index edf60273..85519efa 100644
--- a/templates/vue/default/packages/subgraph/subgraph.yaml
+++ b/templates/vue/default/packages/subgraph/subgraph.yaml
@@ -1,6 +1,6 @@
 specVersion: 0.0.4
 description: Subgraph that indexes the blockchain data
-repository: https://github.com/sablierhq/sablier-subgraph
+repository: https://github.com/sablier-labs/sablier-subgraph
 schema:
   file: ./schema.graphql
 dataSources:
diff --git a/templates/vue/sablier-v1/README.md.ctx b/templates/vue/sablier-v1/README.md.ctx
index d66e891f..8da97cee 100644
--- a/templates/vue/sablier-v1/README.md.ctx
+++ b/templates/vue/sablier-v1/README.md.ctx
@@ -1,11 +1,11 @@
 {
-  "description": "Sablier is the protocol for real-time finance on the Ethereum blockchain. Just like you can stream movies on Netflix or music on Spotify, so you can stream money on Sablier. Read more about it in the [official documentation](https://docs.sablier.finance/).",
+  "description": "Sablier is the protocol for real-time finance on the Ethereum blockchain. Just like you can stream movies on Netflix or music on Spotify, so you can stream money on Sablier. Read more about it in the [official documentation](https://docs.sablier.com/).",
   "packages": [
     "[contracts](/packages/contracts)",
     "[vue-app](/packages/vue-app)"
   ],
   "subgraphName": "Sablier v1",
-  "subgraphUrl": "https://thegraph.com/explorer/subgraph/sablierhq/sablier",
+  "subgraphUrl": "https://thegraph.com/explorer/subgraph/sablier-labs/sablier",
   "templateName": "Sablier v1",
   "templateUrl": "https://github.com/paulrberg/create-eth-app/tree/develop/templates/vue/sablier-v1"
 }
diff --git a/templates/vue/sablier-v1/packages/vue-app/src/components/HelloWorld.vue.ctx b/templates/vue/sablier-v1/packages/vue-app/src/components/HelloWorld.vue.ctx
index 582cd17e..d6a5332b 100644
--- a/templates/vue/sablier-v1/packages/vue-app/src/components/HelloWorld.vue.ctx
+++ b/templates/vue/sablier-v1/packages/vue-app/src/components/HelloWorld.vue.ctx
@@ -17,7 +17,7 @@
     "items": [
       {
         "label": "Core Docs",
-        "url": "https://docs.sablier.finance/"
+        "url": "https://docs.sablier.com/"
       },
       {
         "label": "Community Chat",
@@ -25,7 +25,7 @@
       },
       {
         "label": "Twitter",
-        "url": "https://twitter.com/sablierhq/"
+        "url": "https://twitter.com/sablier-labs/"
       }
     ],
     "name": "Sablier v1"
diff --git a/templates/vue/sablier-v1/packages/vue-app/src/graphql/subgraph.js b/templates/vue/sablier-v1/packages/vue-app/src/graphql/subgraph.js
index 2f0b8406..ef25e788 100644
--- a/templates/vue/sablier-v1/packages/vue-app/src/graphql/subgraph.js
+++ b/templates/vue/sablier-v1/packages/vue-app/src/graphql/subgraph.js
@@ -1,6 +1,6 @@
 import gql from "graphql-tag";
 
-// See more example queries on https://thegraph.com/explorer/subgraph/sablierhq/sablier
+// See more example queries on https://thegraph.com/explorer/subgraph/sablier-labs/sablier
 const GET_STREAMS = gql`
   {
     streams(first: 10, orderBy: timestamp, orderDirection: desc) {
diff --git a/templates/vue/sablier-v1/packages/vue-app/src/main.js.ctx b/templates/vue/sablier-v1/packages/vue-app/src/main.js.ctx
index 2336096d..55e2bb75 100644
--- a/templates/vue/sablier-v1/packages/vue-app/src/main.js.ctx
+++ b/templates/vue/sablier-v1/packages/vue-app/src/main.js.ctx
@@ -1,5 +1,5 @@
 {
   "subgraph": {
-    "url": "https://api.thegraph.com/subgraphs/name/sablierhq/sablier"
+    "url": "https://api.thegraph.com/subgraphs/name/sablier-labs/sablier"
   }
 }