diff --git a/nginx.conf b/nginx.conf
index 0ccabc2206af..8d008fe265c0 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -75,12 +75,12 @@ http {
         rewrite ^/docs/([a-zA-Z][a-zA-Z])/cookbook/quick-start/$                        $scheme://$http_host/docs/$1/subgraphs/quick-start/                                 permanent;
         rewrite ^/docs/([a-zA-Z][a-zA-Z])/cookbook/subgraph-debug-forking/$             $scheme://$http_host/docs/$1/subgraphs/cookbook/subgraph-debug-forking/             permanent;
         rewrite ^/docs/([a-zA-Z][a-zA-Z])/cookbook/subgraph-uncrashable/$               $scheme://$http_host/docs/$1/subgraphs/cookbook/subgraph-uncrashable/               permanent;
-        rewrite ^/docs/([a-zA-Z][a-zA-Z])/cookbook/substreams-powered-subgraphs/$       $scheme://$http_host/docs/$1/sps/introduction/                                      permanent;
-        rewrite ^/docs/([a-zA-Z][a-zA-Z])/subgraphs/cookbook/substreams-powered-subgraphs/$ $scheme://$http_host/docs/$1/sps/introduction/                                  permanent;
+        rewrite ^/docs/([a-zA-Z][a-zA-Z])/cookbook/substreams-powered-subgraphs/$       $scheme://$http_host/docs/$1/substreams/sps/introduction/                           permanent;
+        rewrite ^/docs/([a-zA-Z][a-zA-Z])/subgraphs/cookbook/substreams-powered-subgraphs/$ $scheme://$http_host/docs/$1/substreams/sps/introduction/                       permanent;
         rewrite ^/docs/([a-zA-Z][a-zA-Z])/cookbook/timeseries/$                         $scheme://$http_host/docs/$1/subgraphs/best-practices/timeseries/                   permanent;
         rewrite ^/docs/([a-zA-Z][a-zA-Z])/subgraphs/cookbook/timeseries/$               $scheme://$http_host/docs/$1/subgraphs/best-practices/timeseries/                   permanent;
         rewrite ^/docs/([a-zA-Z][a-zA-Z])/cookbook/transfer-to-the-graph/$              $scheme://$http_host/docs/$1/subgraphs/cookbook/transfer-to-the-graph/              permanent;
-        rewrite ^/docs/([a-zA-Z][a-zA-Z])/subgraphs/cookbook/(.*?)/?$                   $scheme://$http_host/docs/$1/subgraphs/guides/$2/                                   permanent;
+        rewrite ^/docs/([a-zA-Z][a-zA-Z])/subgraphs/cookbook/(.*)$                      $scheme://$http_host/docs/$1/subgraphs/guides/$2                                    permanent;
         rewrite ^/docs/([a-zA-Z][a-zA-Z])/curating/$                                    $scheme://$http_host/docs/$1/resources/roles/curating/                              permanent;
         rewrite ^/docs/([a-zA-Z][a-zA-Z])/delegating/$                                  $scheme://$http_host/docs/$1/resources/roles/delegating/delegating/                 permanent;
         rewrite ^/docs/([a-zA-Z][a-zA-Z])/deploying/deploy-using-subgraph-studio/$      $scheme://$http_host/docs/$1/subgraphs/developing/deploying/using-subgraph-studio/  permanent;
@@ -102,7 +102,7 @@ http {
         rewrite ^/docs/([a-zA-Z][a-zA-Z])/developing/graph-ts/CHANGELOG/$               $scheme://$http_host/docs/$1/subgraphs/developing/creating/graph-ts/CHANGELOG/      permanent;
         rewrite ^/docs/([a-zA-Z][a-zA-Z])/developing/graph-ts/common-issues/$           $scheme://$http_host/docs/$1/subgraphs/developing/creating/graph-ts/common-issues/  permanent;
         rewrite ^/docs/([a-zA-Z][a-zA-Z])/developing/graph-ts/README/$                  $scheme://$http_host/docs/$1/subgraphs/developing/creating/graph-ts/README/         permanent;
-        rewrite ^/docs/([a-zA-Z][a-zA-Z])/developing/substreams-powered-subgraphs-faq/$ $scheme://$http_host/docs/$1/sps/sps-faq/                                           permanent;
+        rewrite ^/docs/([a-zA-Z][a-zA-Z])/developing/substreams-powered-subgraphs-faq/$ $scheme://$http_host/docs/$1/substreams/sps/faq/                                    permanent;
         rewrite ^/docs/([a-zA-Z][a-zA-Z])/developing/supported-networks/$               $scheme://$http_host/docs/$1/supported-networks/                                    permanent;
         rewrite ^/docs/([a-zA-Z][a-zA-Z])/developing/unit-testing-framework/$           $scheme://$http_host/docs/$1/subgraphs/developing/creating/unit-testing-framework/  permanent;
         rewrite ^/docs/([a-zA-Z][a-zA-Z])/explorer/$                                    $scheme://$http_host/docs/$1/subgraphs/explorer/                                    permanent;
@@ -140,8 +140,8 @@ http {
         rewrite ^/docs/([a-zA-Z][a-zA-Z])/resources/release-notes/assemblyscript-migration-guide/$ $scheme://$http_host/docs/$1/resources/migration-guides/assemblyscript-migration-guide/ permanent;
         rewrite ^/docs/([a-zA-Z][a-zA-Z])/release-notes/graphql-validations-migration-guide/$ $scheme://$http_host/docs/$1/resources/migration-guides/graphql-validations-migration-guide/ permanent;
         rewrite ^/docs/([a-zA-Z][a-zA-Z])/resources/release-notes/graphql-validations-migration-guide/$ $scheme://$http_host/docs/$1/resources/migration-guides/graphql-validations-migration-guide/ permanent;
-        rewrite ^/docs/([a-zA-Z][a-zA-Z])/sps/$                                         $scheme://$http_host/docs/$1/sps/introduction/                                      permanent;
-        rewrite ^/docs/([a-zA-Z][a-zA-Z])/sps/triggers-example/$                        $scheme://$http_host/docs/$1/sps/tutorial/                                          permanent;
+        rewrite ^/docs/([a-zA-Z][a-zA-Z])/sps/sps-faq/$                                 $scheme://$http_host/docs/$1/substreams/sps/faq/                                    permanent;
+        rewrite ^/docs/([a-zA-Z][a-zA-Z])/sps/(.*)$                                     $scheme://$http_host/docs/$1/substreams/sps/$2                                      permanent;
         rewrite ^/docs/([a-zA-Z][a-zA-Z])/studio/billing/$                              $scheme://$http_host/docs/$1/subgraphs/billing/                                     permanent;
         rewrite ^/docs/([a-zA-Z][a-zA-Z])/studio/deploy-subgraph-studio/$               $scheme://$http_host/docs/$1/subgraphs/developing/deploying/using-subgraph-studio/  permanent;
         rewrite ^/docs/([a-zA-Z][a-zA-Z])/studio/managing-api-keys/$                    $scheme://$http_host/docs/$1/subgraphs/querying/managing-api-keys/                  permanent;
@@ -151,8 +151,8 @@ http {
         rewrite ^/docs/([a-zA-Z][a-zA-Z])/studio/transferring-subgraph-ownership/$      $scheme://$http_host/docs/$1/subgraphs/developing/managing/transferring-a-subgraph/ permanent;
         rewrite ^/docs/([a-zA-Z][a-zA-Z])/subgraphs/$                                   $scheme://$http_host/docs/$1/subgraphs/quick-start/                                 permanent;
         rewrite ^/docs/([a-zA-Z][a-zA-Z])/substreams/$                                  $scheme://$http_host/docs/$1/substreams/quick-start/                                permanent;
-        rewrite ^/docs/([a-zA-Z][a-zA-Z])/substreams/sps/(.*)$                          $scheme://$http_host/docs/$1/sps/$2                                                 permanent;
         rewrite ^/docs/([a-zA-Z][a-zA-Z])/substreams/developing/sinks/sinks/$           $scheme://$http_host/docs/$1/substreams/developing/sinks/                           permanent;
+        rewrite ^/docs/([a-zA-Z][a-zA-Z])/substreams/sps/$                              $scheme://$http_host/docs/$1/substreams/sps/introduction/                           permanent;
         rewrite ^/docs/([a-zA-Z][a-zA-Z])/sunrise/$                                     $scheme://$http_host/docs/$1/archived/sunrise/                                      permanent;
         rewrite ^/docs/([a-zA-Z][a-zA-Z])/supported-network-requirements/$              $scheme://$http_host/docs/$1/indexing/supported-network-requirements/               permanent;
         rewrite ^/docs/([a-zA-Z][a-zA-Z])/supported-networks/arweave/$                  $scheme://$http_host/docs/$1/subgraphs/cookbook/arweave/                            permanent;
@@ -160,7 +160,6 @@ http {
         rewrite ^/docs/([a-zA-Z][a-zA-Z])/tap/$                                         $scheme://$http_host/docs/$1/indexing/tap/                                          permanent;
         rewrite ^/docs/([a-zA-Z][a-zA-Z])/tokenomics/$                                  $scheme://$http_host/docs/$1/resources/tokenomics/                                  permanent;
         rewrite ^/docs/([a-zA-Z][a-zA-Z])/token-api/$                                   $scheme://$http_host/docs/$1/token-api/quick-start/                                 permanent;
-
         # Temporary redirects (302)
         rewrite ^/docs/en/querying/graph-client/$                                       $scheme://$http_host/docs/en/subgraphs/querying/graph-client/README/                redirect;
         rewrite ^/docs/en/developing/graph-ts/$                                         $scheme://$http_host/docs/en/subgraphs/developing/creating/graph-ts/README/         redirect;
diff --git a/website/next.config.js b/website/next.config.js
index 6aa7cc91bb34..ab4ab3a89c53 100644
--- a/website/next.config.js
+++ b/website/next.config.js
@@ -67,13 +67,6 @@ const withNextra = nextra({
       '---3': {
         type: 'separator',
       },
-      sps: {
-        type: 'children',
-        title: t('global.navigation.sps'),
-      },
-      '---4': {
-        type: 'separator',
-      },
       'token-api': {
         type: 'children',
         title: t('global.navigation.tokenApi'),
diff --git a/website/route-lockfile.txt b/website/route-lockfile.txt
index 3375c692ab0c..336f68520bf0 100644
--- a/website/route-lockfile.txt
+++ b/website/route-lockfile.txt
@@ -24,10 +24,6 @@
 /ar/resources/roles/delegating/undelegating/
 /ar/resources/subgraph-studio-faq/
 /ar/resources/tokenomics/
-/ar/sps/introduction/
-/ar/sps/sps-faq/
-/ar/sps/triggers/
-/ar/sps/tutorial/
 /ar/subgraphs/best-practices/avoid-eth-calls/
 /ar/subgraphs/best-practices/derivedfrom/
 /ar/subgraphs/best-practices/grafting-hotfix/
@@ -85,6 +81,10 @@
 /ar/substreams/introduction/
 /ar/substreams/publishing/
 /ar/substreams/quick-start/
+/ar/substreams/sps/faq/
+/ar/substreams/sps/introduction/
+/ar/substreams/sps/triggers/
+/ar/substreams/sps/tutorial/
 /ar/supported-networks/
 /ar/supported-networks/abstract-testnet/
 /ar/supported-networks/abstract/
@@ -268,10 +268,6 @@
 /cs/resources/roles/delegating/undelegating/
 /cs/resources/subgraph-studio-faq/
 /cs/resources/tokenomics/
-/cs/sps/introduction/
-/cs/sps/sps-faq/
-/cs/sps/triggers/
-/cs/sps/tutorial/
 /cs/subgraphs/best-practices/avoid-eth-calls/
 /cs/subgraphs/best-practices/derivedfrom/
 /cs/subgraphs/best-practices/grafting-hotfix/
@@ -329,6 +325,10 @@
 /cs/substreams/introduction/
 /cs/substreams/publishing/
 /cs/substreams/quick-start/
+/cs/substreams/sps/faq/
+/cs/substreams/sps/introduction/
+/cs/substreams/sps/triggers/
+/cs/substreams/sps/tutorial/
 /cs/supported-networks/
 /cs/supported-networks/abstract-testnet/
 /cs/supported-networks/abstract/
@@ -512,10 +512,6 @@
 /de/resources/roles/delegating/undelegating/
 /de/resources/subgraph-studio-faq/
 /de/resources/tokenomics/
-/de/sps/introduction/
-/de/sps/sps-faq/
-/de/sps/triggers/
-/de/sps/tutorial/
 /de/subgraphs/best-practices/avoid-eth-calls/
 /de/subgraphs/best-practices/derivedfrom/
 /de/subgraphs/best-practices/grafting-hotfix/
@@ -573,6 +569,10 @@
 /de/substreams/introduction/
 /de/substreams/publishing/
 /de/substreams/quick-start/
+/de/substreams/sps/faq/
+/de/substreams/sps/introduction/
+/de/substreams/sps/triggers/
+/de/substreams/sps/tutorial/
 /de/supported-networks/
 /de/supported-networks/abstract-testnet/
 /de/supported-networks/abstract/
@@ -756,10 +756,6 @@
 /en/resources/roles/delegating/undelegating/
 /en/resources/subgraph-studio-faq/
 /en/resources/tokenomics/
-/en/sps/introduction/
-/en/sps/sps-faq/
-/en/sps/triggers/
-/en/sps/tutorial/
 /en/subgraphs/best-practices/avoid-eth-calls/
 /en/subgraphs/best-practices/derivedfrom/
 /en/subgraphs/best-practices/grafting-hotfix/
@@ -817,6 +813,10 @@
 /en/substreams/introduction/
 /en/substreams/publishing/
 /en/substreams/quick-start/
+/en/substreams/sps/faq/
+/en/substreams/sps/introduction/
+/en/substreams/sps/triggers/
+/en/substreams/sps/tutorial/
 /en/supported-networks/
 /en/supported-networks/abstract-testnet/
 /en/supported-networks/abstract/
@@ -1000,10 +1000,6 @@
 /es/resources/roles/delegating/undelegating/
 /es/resources/subgraph-studio-faq/
 /es/resources/tokenomics/
-/es/sps/introduction/
-/es/sps/sps-faq/
-/es/sps/triggers/
-/es/sps/tutorial/
 /es/subgraphs/best-practices/avoid-eth-calls/
 /es/subgraphs/best-practices/derivedfrom/
 /es/subgraphs/best-practices/grafting-hotfix/
@@ -1061,6 +1057,10 @@
 /es/substreams/introduction/
 /es/substreams/publishing/
 /es/substreams/quick-start/
+/es/substreams/sps/faq/
+/es/substreams/sps/introduction/
+/es/substreams/sps/triggers/
+/es/substreams/sps/tutorial/
 /es/supported-networks/
 /es/supported-networks/abstract-testnet/
 /es/supported-networks/abstract/
@@ -1244,10 +1244,6 @@
 /fr/resources/roles/delegating/undelegating/
 /fr/resources/subgraph-studio-faq/
 /fr/resources/tokenomics/
-/fr/sps/introduction/
-/fr/sps/sps-faq/
-/fr/sps/triggers/
-/fr/sps/tutorial/
 /fr/subgraphs/best-practices/avoid-eth-calls/
 /fr/subgraphs/best-practices/derivedfrom/
 /fr/subgraphs/best-practices/grafting-hotfix/
@@ -1305,6 +1301,10 @@
 /fr/substreams/introduction/
 /fr/substreams/publishing/
 /fr/substreams/quick-start/
+/fr/substreams/sps/faq/
+/fr/substreams/sps/introduction/
+/fr/substreams/sps/triggers/
+/fr/substreams/sps/tutorial/
 /fr/supported-networks/
 /fr/supported-networks/abstract-testnet/
 /fr/supported-networks/abstract/
@@ -1488,10 +1488,6 @@
 /hi/resources/roles/delegating/undelegating/
 /hi/resources/subgraph-studio-faq/
 /hi/resources/tokenomics/
-/hi/sps/introduction/
-/hi/sps/sps-faq/
-/hi/sps/triggers/
-/hi/sps/tutorial/
 /hi/subgraphs/best-practices/avoid-eth-calls/
 /hi/subgraphs/best-practices/derivedfrom/
 /hi/subgraphs/best-practices/grafting-hotfix/
@@ -1549,6 +1545,10 @@
 /hi/substreams/introduction/
 /hi/substreams/publishing/
 /hi/substreams/quick-start/
+/hi/substreams/sps/faq/
+/hi/substreams/sps/introduction/
+/hi/substreams/sps/triggers/
+/hi/substreams/sps/tutorial/
 /hi/supported-networks/
 /hi/supported-networks/abstract-testnet/
 /hi/supported-networks/abstract/
@@ -1732,10 +1732,6 @@
 /it/resources/roles/delegating/undelegating/
 /it/resources/subgraph-studio-faq/
 /it/resources/tokenomics/
-/it/sps/introduction/
-/it/sps/sps-faq/
-/it/sps/triggers/
-/it/sps/tutorial/
 /it/subgraphs/best-practices/avoid-eth-calls/
 /it/subgraphs/best-practices/derivedfrom/
 /it/subgraphs/best-practices/grafting-hotfix/
@@ -1793,6 +1789,10 @@
 /it/substreams/introduction/
 /it/substreams/publishing/
 /it/substreams/quick-start/
+/it/substreams/sps/faq/
+/it/substreams/sps/introduction/
+/it/substreams/sps/triggers/
+/it/substreams/sps/tutorial/
 /it/supported-networks/
 /it/supported-networks/abstract-testnet/
 /it/supported-networks/abstract/
@@ -1976,10 +1976,6 @@
 /ja/resources/roles/delegating/undelegating/
 /ja/resources/subgraph-studio-faq/
 /ja/resources/tokenomics/
-/ja/sps/introduction/
-/ja/sps/sps-faq/
-/ja/sps/triggers/
-/ja/sps/tutorial/
 /ja/subgraphs/best-practices/avoid-eth-calls/
 /ja/subgraphs/best-practices/derivedfrom/
 /ja/subgraphs/best-practices/grafting-hotfix/
@@ -2037,6 +2033,10 @@
 /ja/substreams/introduction/
 /ja/substreams/publishing/
 /ja/substreams/quick-start/
+/ja/substreams/sps/faq/
+/ja/substreams/sps/introduction/
+/ja/substreams/sps/triggers/
+/ja/substreams/sps/tutorial/
 /ja/supported-networks/
 /ja/supported-networks/abstract-testnet/
 /ja/supported-networks/abstract/
@@ -2218,10 +2218,6 @@
 /ko/resources/roles/delegating/undelegating/
 /ko/resources/subgraph-studio-faq/
 /ko/resources/tokenomics/
-/ko/sps/introduction/
-/ko/sps/sps-faq/
-/ko/sps/triggers/
-/ko/sps/tutorial/
 /ko/subgraphs/best-practices/avoid-eth-calls/
 /ko/subgraphs/best-practices/derivedfrom/
 /ko/subgraphs/best-practices/grafting-hotfix/
@@ -2279,6 +2275,10 @@
 /ko/substreams/introduction/
 /ko/substreams/publishing/
 /ko/substreams/quick-start/
+/ko/substreams/sps/faq/
+/ko/substreams/sps/introduction/
+/ko/substreams/sps/triggers/
+/ko/substreams/sps/tutorial/
 /ko/supported-networks/
 /ko/token-api/evm/get-balances-evm-by-address/
 /ko/token-api/evm/get-holders-evm-by-contract/
@@ -2318,10 +2318,6 @@
 /mr/resources/roles/delegating/undelegating/
 /mr/resources/subgraph-studio-faq/
 /mr/resources/tokenomics/
-/mr/sps/introduction/
-/mr/sps/sps-faq/
-/mr/sps/triggers/
-/mr/sps/tutorial/
 /mr/subgraphs/best-practices/avoid-eth-calls/
 /mr/subgraphs/best-practices/derivedfrom/
 /mr/subgraphs/best-practices/grafting-hotfix/
@@ -2379,6 +2375,10 @@
 /mr/substreams/introduction/
 /mr/substreams/publishing/
 /mr/substreams/quick-start/
+/mr/substreams/sps/faq/
+/mr/substreams/sps/introduction/
+/mr/substreams/sps/triggers/
+/mr/substreams/sps/tutorial/
 /mr/supported-networks/
 /mr/supported-networks/abstract-testnet/
 /mr/supported-networks/abstract/
@@ -2560,10 +2560,6 @@
 /nl/resources/roles/delegating/undelegating/
 /nl/resources/subgraph-studio-faq/
 /nl/resources/tokenomics/
-/nl/sps/introduction/
-/nl/sps/sps-faq/
-/nl/sps/triggers/
-/nl/sps/tutorial/
 /nl/subgraphs/best-practices/avoid-eth-calls/
 /nl/subgraphs/best-practices/derivedfrom/
 /nl/subgraphs/best-practices/grafting-hotfix/
@@ -2621,6 +2617,10 @@
 /nl/substreams/introduction/
 /nl/substreams/publishing/
 /nl/substreams/quick-start/
+/nl/substreams/sps/faq/
+/nl/substreams/sps/introduction/
+/nl/substreams/sps/triggers/
+/nl/substreams/sps/tutorial/
 /nl/supported-networks/
 /nl/token-api/evm/get-balances-evm-by-address/
 /nl/token-api/evm/get-holders-evm-by-contract/
@@ -2658,10 +2658,6 @@
 /pl/resources/roles/delegating/undelegating/
 /pl/resources/subgraph-studio-faq/
 /pl/resources/tokenomics/
-/pl/sps/introduction/
-/pl/sps/sps-faq/
-/pl/sps/triggers/
-/pl/sps/tutorial/
 /pl/subgraphs/best-practices/avoid-eth-calls/
 /pl/subgraphs/best-practices/derivedfrom/
 /pl/subgraphs/best-practices/grafting-hotfix/
@@ -2719,6 +2715,10 @@
 /pl/substreams/introduction/
 /pl/substreams/publishing/
 /pl/substreams/quick-start/
+/pl/substreams/sps/faq/
+/pl/substreams/sps/introduction/
+/pl/substreams/sps/triggers/
+/pl/substreams/sps/tutorial/
 /pl/supported-networks/
 /pl/token-api/evm/get-balances-evm-by-address/
 /pl/token-api/evm/get-holders-evm-by-contract/
@@ -2758,10 +2758,6 @@
 /pt/resources/roles/delegating/undelegating/
 /pt/resources/subgraph-studio-faq/
 /pt/resources/tokenomics/
-/pt/sps/introduction/
-/pt/sps/sps-faq/
-/pt/sps/triggers/
-/pt/sps/tutorial/
 /pt/subgraphs/best-practices/avoid-eth-calls/
 /pt/subgraphs/best-practices/derivedfrom/
 /pt/subgraphs/best-practices/grafting-hotfix/
@@ -2819,6 +2815,10 @@
 /pt/substreams/introduction/
 /pt/substreams/publishing/
 /pt/substreams/quick-start/
+/pt/substreams/sps/faq/
+/pt/substreams/sps/introduction/
+/pt/substreams/sps/triggers/
+/pt/substreams/sps/tutorial/
 /pt/supported-networks/
 /pt/supported-networks/abstract-testnet/
 /pt/supported-networks/abstract/
@@ -3000,10 +3000,6 @@
 /ro/resources/roles/delegating/undelegating/
 /ro/resources/subgraph-studio-faq/
 /ro/resources/tokenomics/
-/ro/sps/introduction/
-/ro/sps/sps-faq/
-/ro/sps/triggers/
-/ro/sps/tutorial/
 /ro/subgraphs/best-practices/avoid-eth-calls/
 /ro/subgraphs/best-practices/derivedfrom/
 /ro/subgraphs/best-practices/grafting-hotfix/
@@ -3061,6 +3057,10 @@
 /ro/substreams/introduction/
 /ro/substreams/publishing/
 /ro/substreams/quick-start/
+/ro/substreams/sps/faq/
+/ro/substreams/sps/introduction/
+/ro/substreams/sps/triggers/
+/ro/substreams/sps/tutorial/
 /ro/supported-networks/
 /ro/token-api/evm/get-balances-evm-by-address/
 /ro/token-api/evm/get-holders-evm-by-contract/
@@ -3100,10 +3100,6 @@
 /ru/resources/roles/delegating/undelegating/
 /ru/resources/subgraph-studio-faq/
 /ru/resources/tokenomics/
-/ru/sps/introduction/
-/ru/sps/sps-faq/
-/ru/sps/triggers/
-/ru/sps/tutorial/
 /ru/subgraphs/best-practices/avoid-eth-calls/
 /ru/subgraphs/best-practices/derivedfrom/
 /ru/subgraphs/best-practices/grafting-hotfix/
@@ -3161,6 +3157,10 @@
 /ru/substreams/introduction/
 /ru/substreams/publishing/
 /ru/substreams/quick-start/
+/ru/substreams/sps/faq/
+/ru/substreams/sps/introduction/
+/ru/substreams/sps/triggers/
+/ru/substreams/sps/tutorial/
 /ru/supported-networks/
 /ru/supported-networks/abstract-testnet/
 /ru/supported-networks/abstract/
@@ -3344,10 +3344,6 @@
 /sv/resources/roles/delegating/undelegating/
 /sv/resources/subgraph-studio-faq/
 /sv/resources/tokenomics/
-/sv/sps/introduction/
-/sv/sps/sps-faq/
-/sv/sps/triggers/
-/sv/sps/tutorial/
 /sv/subgraphs/best-practices/avoid-eth-calls/
 /sv/subgraphs/best-practices/derivedfrom/
 /sv/subgraphs/best-practices/grafting-hotfix/
@@ -3405,6 +3401,10 @@
 /sv/substreams/introduction/
 /sv/substreams/publishing/
 /sv/substreams/quick-start/
+/sv/substreams/sps/faq/
+/sv/substreams/sps/introduction/
+/sv/substreams/sps/triggers/
+/sv/substreams/sps/tutorial/
 /sv/supported-networks/
 /sv/supported-networks/abstract-testnet/
 /sv/supported-networks/abstract/
@@ -3588,10 +3588,6 @@
 /tr/resources/roles/delegating/undelegating/
 /tr/resources/subgraph-studio-faq/
 /tr/resources/tokenomics/
-/tr/sps/introduction/
-/tr/sps/sps-faq/
-/tr/sps/triggers/
-/tr/sps/tutorial/
 /tr/subgraphs/best-practices/avoid-eth-calls/
 /tr/subgraphs/best-practices/derivedfrom/
 /tr/subgraphs/best-practices/grafting-hotfix/
@@ -3649,6 +3645,10 @@
 /tr/substreams/introduction/
 /tr/substreams/publishing/
 /tr/substreams/quick-start/
+/tr/substreams/sps/faq/
+/tr/substreams/sps/introduction/
+/tr/substreams/sps/triggers/
+/tr/substreams/sps/tutorial/
 /tr/supported-networks/
 /tr/supported-networks/abstract-testnet/
 /tr/supported-networks/abstract/
@@ -3830,10 +3830,6 @@
 /uk/resources/roles/delegating/undelegating/
 /uk/resources/subgraph-studio-faq/
 /uk/resources/tokenomics/
-/uk/sps/introduction/
-/uk/sps/sps-faq/
-/uk/sps/triggers/
-/uk/sps/tutorial/
 /uk/subgraphs/best-practices/avoid-eth-calls/
 /uk/subgraphs/best-practices/derivedfrom/
 /uk/subgraphs/best-practices/grafting-hotfix/
@@ -3891,6 +3887,10 @@
 /uk/substreams/introduction/
 /uk/substreams/publishing/
 /uk/substreams/quick-start/
+/uk/substreams/sps/faq/
+/uk/substreams/sps/introduction/
+/uk/substreams/sps/triggers/
+/uk/substreams/sps/tutorial/
 /uk/supported-networks/
 /uk/token-api/evm/get-balances-evm-by-address/
 /uk/token-api/evm/get-holders-evm-by-contract/
@@ -3930,10 +3930,6 @@
 /ur/resources/roles/delegating/undelegating/
 /ur/resources/subgraph-studio-faq/
 /ur/resources/tokenomics/
-/ur/sps/introduction/
-/ur/sps/sps-faq/
-/ur/sps/triggers/
-/ur/sps/tutorial/
 /ur/subgraphs/best-practices/avoid-eth-calls/
 /ur/subgraphs/best-practices/derivedfrom/
 /ur/subgraphs/best-practices/grafting-hotfix/
@@ -3991,6 +3987,10 @@
 /ur/substreams/introduction/
 /ur/substreams/publishing/
 /ur/substreams/quick-start/
+/ur/substreams/sps/faq/
+/ur/substreams/sps/introduction/
+/ur/substreams/sps/triggers/
+/ur/substreams/sps/tutorial/
 /ur/supported-networks/
 /ur/supported-networks/abstract-testnet/
 /ur/supported-networks/abstract/
@@ -4172,10 +4172,6 @@
 /vi/resources/roles/delegating/undelegating/
 /vi/resources/subgraph-studio-faq/
 /vi/resources/tokenomics/
-/vi/sps/introduction/
-/vi/sps/sps-faq/
-/vi/sps/triggers/
-/vi/sps/tutorial/
 /vi/subgraphs/best-practices/avoid-eth-calls/
 /vi/subgraphs/best-practices/derivedfrom/
 /vi/subgraphs/best-practices/grafting-hotfix/
@@ -4233,6 +4229,10 @@
 /vi/substreams/introduction/
 /vi/substreams/publishing/
 /vi/substreams/quick-start/
+/vi/substreams/sps/faq/
+/vi/substreams/sps/introduction/
+/vi/substreams/sps/triggers/
+/vi/substreams/sps/tutorial/
 /vi/supported-networks/
 /vi/token-api/evm/get-balances-evm-by-address/
 /vi/token-api/evm/get-holders-evm-by-contract/
@@ -4272,10 +4272,6 @@
 /zh/resources/roles/delegating/undelegating/
 /zh/resources/subgraph-studio-faq/
 /zh/resources/tokenomics/
-/zh/sps/introduction/
-/zh/sps/sps-faq/
-/zh/sps/triggers/
-/zh/sps/tutorial/
 /zh/subgraphs/best-practices/avoid-eth-calls/
 /zh/subgraphs/best-practices/derivedfrom/
 /zh/subgraphs/best-practices/grafting-hotfix/
@@ -4333,6 +4329,10 @@
 /zh/substreams/introduction/
 /zh/substreams/publishing/
 /zh/substreams/quick-start/
+/zh/substreams/sps/faq/
+/zh/substreams/sps/introduction/
+/zh/substreams/sps/triggers/
+/zh/substreams/sps/tutorial/
 /zh/supported-networks/
 /zh/supported-networks/abstract-testnet/
 /zh/supported-networks/abstract/
diff --git a/website/src/pages/ar/substreams/_meta-titles.json b/website/src/pages/ar/substreams/_meta-titles.json
index 6262ad528c3a..b8799cc89251 100644
--- a/website/src/pages/ar/substreams/_meta-titles.json
+++ b/website/src/pages/ar/substreams/_meta-titles.json
@@ -1,3 +1,4 @@
 {
-  "developing": "Developing"
+  "developing": "Developing",
+  "sps": "Substreams-powered Subgraphs"
 }
diff --git a/website/src/pages/ar/substreams/_meta.js b/website/src/pages/ar/substreams/_meta.js
index e4021b86dbb8..628a69e671e8 100644
--- a/website/src/pages/ar/substreams/_meta.js
+++ b/website/src/pages/ar/substreams/_meta.js
@@ -5,4 +5,5 @@ export default {
   introduction: '',
   developing: titles.developing,
   publishing: '',
+  sps: titles.sps,
 }
diff --git a/website/src/pages/ar/sps/_meta.js b/website/src/pages/ar/substreams/sps/_meta.js
similarity index 80%
rename from website/src/pages/ar/sps/_meta.js
rename to website/src/pages/ar/substreams/sps/_meta.js
index 75c5e3094895..86fcd3df5ec0 100644
--- a/website/src/pages/ar/sps/_meta.js
+++ b/website/src/pages/ar/substreams/sps/_meta.js
@@ -2,5 +2,5 @@ export default {
   introduction: '',
   triggers: '',
   tutorial: '',
-  'sps-faq': '',
+  faq: '',
 }
diff --git a/website/src/pages/ar/sps/sps-faq.mdx b/website/src/pages/ar/substreams/sps/faq.mdx
similarity index 100%
rename from website/src/pages/ar/sps/sps-faq.mdx
rename to website/src/pages/ar/substreams/sps/faq.mdx
diff --git a/website/src/pages/ar/sps/introduction.mdx b/website/src/pages/ar/substreams/sps/introduction.mdx
similarity index 100%
rename from website/src/pages/ar/sps/introduction.mdx
rename to website/src/pages/ar/substreams/sps/introduction.mdx
diff --git a/website/src/pages/ar/sps/triggers.mdx b/website/src/pages/ar/substreams/sps/triggers.mdx
similarity index 100%
rename from website/src/pages/ar/sps/triggers.mdx
rename to website/src/pages/ar/substreams/sps/triggers.mdx
diff --git a/website/src/pages/ar/sps/tutorial.mdx b/website/src/pages/ar/substreams/sps/tutorial.mdx
similarity index 100%
rename from website/src/pages/ar/sps/tutorial.mdx
rename to website/src/pages/ar/substreams/sps/tutorial.mdx
diff --git a/website/src/pages/cs/substreams/_meta-titles.json b/website/src/pages/cs/substreams/_meta-titles.json
index 6262ad528c3a..b8799cc89251 100644
--- a/website/src/pages/cs/substreams/_meta-titles.json
+++ b/website/src/pages/cs/substreams/_meta-titles.json
@@ -1,3 +1,4 @@
 {
-  "developing": "Developing"
+  "developing": "Developing",
+  "sps": "Substreams-powered Subgraphs"
 }
diff --git a/website/src/pages/cs/substreams/_meta.js b/website/src/pages/cs/substreams/_meta.js
index e4021b86dbb8..628a69e671e8 100644
--- a/website/src/pages/cs/substreams/_meta.js
+++ b/website/src/pages/cs/substreams/_meta.js
@@ -5,4 +5,5 @@ export default {
   introduction: '',
   developing: titles.developing,
   publishing: '',
+  sps: titles.sps,
 }
diff --git a/website/src/pages/cs/sps/_meta.js b/website/src/pages/cs/substreams/sps/_meta.js
similarity index 80%
rename from website/src/pages/cs/sps/_meta.js
rename to website/src/pages/cs/substreams/sps/_meta.js
index 75c5e3094895..86fcd3df5ec0 100644
--- a/website/src/pages/cs/sps/_meta.js
+++ b/website/src/pages/cs/substreams/sps/_meta.js
@@ -2,5 +2,5 @@ export default {
   introduction: '',
   triggers: '',
   tutorial: '',
-  'sps-faq': '',
+  faq: '',
 }
diff --git a/website/src/pages/cs/sps/sps-faq.mdx b/website/src/pages/cs/substreams/sps/faq.mdx
similarity index 100%
rename from website/src/pages/cs/sps/sps-faq.mdx
rename to website/src/pages/cs/substreams/sps/faq.mdx
diff --git a/website/src/pages/cs/sps/introduction.mdx b/website/src/pages/cs/substreams/sps/introduction.mdx
similarity index 100%
rename from website/src/pages/cs/sps/introduction.mdx
rename to website/src/pages/cs/substreams/sps/introduction.mdx
diff --git a/website/src/pages/cs/sps/triggers.mdx b/website/src/pages/cs/substreams/sps/triggers.mdx
similarity index 100%
rename from website/src/pages/cs/sps/triggers.mdx
rename to website/src/pages/cs/substreams/sps/triggers.mdx
diff --git a/website/src/pages/cs/sps/tutorial.mdx b/website/src/pages/cs/substreams/sps/tutorial.mdx
similarity index 100%
rename from website/src/pages/cs/sps/tutorial.mdx
rename to website/src/pages/cs/substreams/sps/tutorial.mdx
diff --git a/website/src/pages/de/substreams/_meta-titles.json b/website/src/pages/de/substreams/_meta-titles.json
index cf75f2729d64..b8799cc89251 100644
--- a/website/src/pages/de/substreams/_meta-titles.json
+++ b/website/src/pages/de/substreams/_meta-titles.json
@@ -1,3 +1,4 @@
 {
-  "developing": "Entwicklung"
+  "developing": "Developing",
+  "sps": "Substreams-powered Subgraphs"
 }
diff --git a/website/src/pages/de/substreams/_meta.js b/website/src/pages/de/substreams/_meta.js
index e4021b86dbb8..628a69e671e8 100644
--- a/website/src/pages/de/substreams/_meta.js
+++ b/website/src/pages/de/substreams/_meta.js
@@ -5,4 +5,5 @@ export default {
   introduction: '',
   developing: titles.developing,
   publishing: '',
+  sps: titles.sps,
 }
diff --git a/website/src/pages/de/sps/_meta.js b/website/src/pages/de/substreams/sps/_meta.js
similarity index 80%
rename from website/src/pages/de/sps/_meta.js
rename to website/src/pages/de/substreams/sps/_meta.js
index 75c5e3094895..86fcd3df5ec0 100644
--- a/website/src/pages/de/sps/_meta.js
+++ b/website/src/pages/de/substreams/sps/_meta.js
@@ -2,5 +2,5 @@ export default {
   introduction: '',
   triggers: '',
   tutorial: '',
-  'sps-faq': '',
+  faq: '',
 }
diff --git a/website/src/pages/de/sps/sps-faq.mdx b/website/src/pages/de/substreams/sps/faq.mdx
similarity index 100%
rename from website/src/pages/de/sps/sps-faq.mdx
rename to website/src/pages/de/substreams/sps/faq.mdx
diff --git a/website/src/pages/de/sps/introduction.mdx b/website/src/pages/de/substreams/sps/introduction.mdx
similarity index 100%
rename from website/src/pages/de/sps/introduction.mdx
rename to website/src/pages/de/substreams/sps/introduction.mdx
diff --git a/website/src/pages/de/sps/triggers.mdx b/website/src/pages/de/substreams/sps/triggers.mdx
similarity index 100%
rename from website/src/pages/de/sps/triggers.mdx
rename to website/src/pages/de/substreams/sps/triggers.mdx
diff --git a/website/src/pages/de/sps/tutorial.mdx b/website/src/pages/de/substreams/sps/tutorial.mdx
similarity index 100%
rename from website/src/pages/de/sps/tutorial.mdx
rename to website/src/pages/de/substreams/sps/tutorial.mdx
diff --git a/website/src/pages/en/substreams/_meta-titles.json b/website/src/pages/en/substreams/_meta-titles.json
index 6262ad528c3a..b8799cc89251 100644
--- a/website/src/pages/en/substreams/_meta-titles.json
+++ b/website/src/pages/en/substreams/_meta-titles.json
@@ -1,3 +1,4 @@
 {
-  "developing": "Developing"
+  "developing": "Developing",
+  "sps": "Substreams-powered Subgraphs"
 }
diff --git a/website/src/pages/en/substreams/_meta.js b/website/src/pages/en/substreams/_meta.js
index e4021b86dbb8..628a69e671e8 100644
--- a/website/src/pages/en/substreams/_meta.js
+++ b/website/src/pages/en/substreams/_meta.js
@@ -5,4 +5,5 @@ export default {
   introduction: '',
   developing: titles.developing,
   publishing: '',
+  sps: titles.sps,
 }
diff --git a/website/src/pages/en/sps/_meta.js b/website/src/pages/en/substreams/sps/_meta.js
similarity index 80%
rename from website/src/pages/en/sps/_meta.js
rename to website/src/pages/en/substreams/sps/_meta.js
index 75c5e3094895..86fcd3df5ec0 100644
--- a/website/src/pages/en/sps/_meta.js
+++ b/website/src/pages/en/substreams/sps/_meta.js
@@ -2,5 +2,5 @@ export default {
   introduction: '',
   triggers: '',
   tutorial: '',
-  'sps-faq': '',
+  faq: '',
 }
diff --git a/website/src/pages/en/sps/sps-faq.mdx b/website/src/pages/en/substreams/sps/faq.mdx
similarity index 100%
rename from website/src/pages/en/sps/sps-faq.mdx
rename to website/src/pages/en/substreams/sps/faq.mdx
diff --git a/website/src/pages/en/sps/introduction.mdx b/website/src/pages/en/substreams/sps/introduction.mdx
similarity index 100%
rename from website/src/pages/en/sps/introduction.mdx
rename to website/src/pages/en/substreams/sps/introduction.mdx
diff --git a/website/src/pages/en/sps/triggers.mdx b/website/src/pages/en/substreams/sps/triggers.mdx
similarity index 100%
rename from website/src/pages/en/sps/triggers.mdx
rename to website/src/pages/en/substreams/sps/triggers.mdx
diff --git a/website/src/pages/en/sps/tutorial.mdx b/website/src/pages/en/substreams/sps/tutorial.mdx
similarity index 100%
rename from website/src/pages/en/sps/tutorial.mdx
rename to website/src/pages/en/substreams/sps/tutorial.mdx
diff --git a/website/src/pages/es/sps/_meta.js b/website/src/pages/es/sps/_meta.js
deleted file mode 100644
index 75c5e3094895..000000000000
--- a/website/src/pages/es/sps/_meta.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export default {
-  introduction: '',
-  triggers: '',
-  tutorial: '',
-  'sps-faq': '',
-}
diff --git a/website/src/pages/es/substreams/_meta-titles.json b/website/src/pages/es/substreams/_meta-titles.json
index 6262ad528c3a..b8799cc89251 100644
--- a/website/src/pages/es/substreams/_meta-titles.json
+++ b/website/src/pages/es/substreams/_meta-titles.json
@@ -1,3 +1,4 @@
 {
-  "developing": "Developing"
+  "developing": "Developing",
+  "sps": "Substreams-powered Subgraphs"
 }
diff --git a/website/src/pages/es/substreams/_meta.js b/website/src/pages/es/substreams/_meta.js
index e4021b86dbb8..628a69e671e8 100644
--- a/website/src/pages/es/substreams/_meta.js
+++ b/website/src/pages/es/substreams/_meta.js
@@ -5,4 +5,5 @@ export default {
   introduction: '',
   developing: titles.developing,
   publishing: '',
+  sps: titles.sps,
 }
diff --git a/website/src/pages/es/substreams/sps/_meta.js b/website/src/pages/es/substreams/sps/_meta.js
new file mode 100644
index 000000000000..86fcd3df5ec0
--- /dev/null
+++ b/website/src/pages/es/substreams/sps/_meta.js
@@ -0,0 +1,6 @@
+export default {
+  introduction: '',
+  triggers: '',
+  tutorial: '',
+  faq: '',
+}
diff --git a/website/src/pages/es/sps/sps-faq.mdx b/website/src/pages/es/substreams/sps/faq.mdx
similarity index 100%
rename from website/src/pages/es/sps/sps-faq.mdx
rename to website/src/pages/es/substreams/sps/faq.mdx
diff --git a/website/src/pages/es/sps/introduction.mdx b/website/src/pages/es/substreams/sps/introduction.mdx
similarity index 100%
rename from website/src/pages/es/sps/introduction.mdx
rename to website/src/pages/es/substreams/sps/introduction.mdx
diff --git a/website/src/pages/es/sps/triggers.mdx b/website/src/pages/es/substreams/sps/triggers.mdx
similarity index 100%
rename from website/src/pages/es/sps/triggers.mdx
rename to website/src/pages/es/substreams/sps/triggers.mdx
diff --git a/website/src/pages/es/sps/tutorial.mdx b/website/src/pages/es/substreams/sps/tutorial.mdx
similarity index 100%
rename from website/src/pages/es/sps/tutorial.mdx
rename to website/src/pages/es/substreams/sps/tutorial.mdx
diff --git a/website/src/pages/fr/sps/_meta.js b/website/src/pages/fr/sps/_meta.js
deleted file mode 100644
index 75c5e3094895..000000000000
--- a/website/src/pages/fr/sps/_meta.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export default {
-  introduction: '',
-  triggers: '',
-  tutorial: '',
-  'sps-faq': '',
-}
diff --git a/website/src/pages/fr/substreams/_meta-titles.json b/website/src/pages/fr/substreams/_meta-titles.json
index bd6a51423076..b8799cc89251 100644
--- a/website/src/pages/fr/substreams/_meta-titles.json
+++ b/website/src/pages/fr/substreams/_meta-titles.json
@@ -1,3 +1,4 @@
 {
-  "developing": "Développement"
+  "developing": "Developing",
+  "sps": "Substreams-powered Subgraphs"
 }
diff --git a/website/src/pages/fr/substreams/_meta.js b/website/src/pages/fr/substreams/_meta.js
index e4021b86dbb8..628a69e671e8 100644
--- a/website/src/pages/fr/substreams/_meta.js
+++ b/website/src/pages/fr/substreams/_meta.js
@@ -5,4 +5,5 @@ export default {
   introduction: '',
   developing: titles.developing,
   publishing: '',
+  sps: titles.sps,
 }
diff --git a/website/src/pages/fr/substreams/sps/_meta.js b/website/src/pages/fr/substreams/sps/_meta.js
new file mode 100644
index 000000000000..86fcd3df5ec0
--- /dev/null
+++ b/website/src/pages/fr/substreams/sps/_meta.js
@@ -0,0 +1,6 @@
+export default {
+  introduction: '',
+  triggers: '',
+  tutorial: '',
+  faq: '',
+}
diff --git a/website/src/pages/fr/sps/sps-faq.mdx b/website/src/pages/fr/substreams/sps/faq.mdx
similarity index 100%
rename from website/src/pages/fr/sps/sps-faq.mdx
rename to website/src/pages/fr/substreams/sps/faq.mdx
diff --git a/website/src/pages/fr/sps/introduction.mdx b/website/src/pages/fr/substreams/sps/introduction.mdx
similarity index 100%
rename from website/src/pages/fr/sps/introduction.mdx
rename to website/src/pages/fr/substreams/sps/introduction.mdx
diff --git a/website/src/pages/fr/sps/triggers.mdx b/website/src/pages/fr/substreams/sps/triggers.mdx
similarity index 100%
rename from website/src/pages/fr/sps/triggers.mdx
rename to website/src/pages/fr/substreams/sps/triggers.mdx
diff --git a/website/src/pages/fr/sps/tutorial.mdx b/website/src/pages/fr/substreams/sps/tutorial.mdx
similarity index 100%
rename from website/src/pages/fr/sps/tutorial.mdx
rename to website/src/pages/fr/substreams/sps/tutorial.mdx
diff --git a/website/src/pages/hi/sps/_meta.js b/website/src/pages/hi/sps/_meta.js
deleted file mode 100644
index 75c5e3094895..000000000000
--- a/website/src/pages/hi/sps/_meta.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export default {
-  introduction: '',
-  triggers: '',
-  tutorial: '',
-  'sps-faq': '',
-}
diff --git a/website/src/pages/hi/substreams/_meta-titles.json b/website/src/pages/hi/substreams/_meta-titles.json
index 83856f5ffbb5..b8799cc89251 100644
--- a/website/src/pages/hi/substreams/_meta-titles.json
+++ b/website/src/pages/hi/substreams/_meta-titles.json
@@ -1,3 +1,4 @@
 {
-  "developing": "विकसित करना"
+  "developing": "Developing",
+  "sps": "Substreams-powered Subgraphs"
 }
diff --git a/website/src/pages/hi/substreams/_meta.js b/website/src/pages/hi/substreams/_meta.js
index e4021b86dbb8..628a69e671e8 100644
--- a/website/src/pages/hi/substreams/_meta.js
+++ b/website/src/pages/hi/substreams/_meta.js
@@ -5,4 +5,5 @@ export default {
   introduction: '',
   developing: titles.developing,
   publishing: '',
+  sps: titles.sps,
 }
diff --git a/website/src/pages/hi/substreams/sps/_meta.js b/website/src/pages/hi/substreams/sps/_meta.js
new file mode 100644
index 000000000000..86fcd3df5ec0
--- /dev/null
+++ b/website/src/pages/hi/substreams/sps/_meta.js
@@ -0,0 +1,6 @@
+export default {
+  introduction: '',
+  triggers: '',
+  tutorial: '',
+  faq: '',
+}
diff --git a/website/src/pages/hi/sps/sps-faq.mdx b/website/src/pages/hi/substreams/sps/faq.mdx
similarity index 100%
rename from website/src/pages/hi/sps/sps-faq.mdx
rename to website/src/pages/hi/substreams/sps/faq.mdx
diff --git a/website/src/pages/hi/sps/introduction.mdx b/website/src/pages/hi/substreams/sps/introduction.mdx
similarity index 100%
rename from website/src/pages/hi/sps/introduction.mdx
rename to website/src/pages/hi/substreams/sps/introduction.mdx
diff --git a/website/src/pages/hi/sps/triggers.mdx b/website/src/pages/hi/substreams/sps/triggers.mdx
similarity index 100%
rename from website/src/pages/hi/sps/triggers.mdx
rename to website/src/pages/hi/substreams/sps/triggers.mdx
diff --git a/website/src/pages/hi/sps/tutorial.mdx b/website/src/pages/hi/substreams/sps/tutorial.mdx
similarity index 100%
rename from website/src/pages/hi/sps/tutorial.mdx
rename to website/src/pages/hi/substreams/sps/tutorial.mdx
diff --git a/website/src/pages/it/sps/_meta.js b/website/src/pages/it/sps/_meta.js
deleted file mode 100644
index 75c5e3094895..000000000000
--- a/website/src/pages/it/sps/_meta.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export default {
-  introduction: '',
-  triggers: '',
-  tutorial: '',
-  'sps-faq': '',
-}
diff --git a/website/src/pages/it/substreams/_meta-titles.json b/website/src/pages/it/substreams/_meta-titles.json
index 6262ad528c3a..b8799cc89251 100644
--- a/website/src/pages/it/substreams/_meta-titles.json
+++ b/website/src/pages/it/substreams/_meta-titles.json
@@ -1,3 +1,4 @@
 {
-  "developing": "Developing"
+  "developing": "Developing",
+  "sps": "Substreams-powered Subgraphs"
 }
diff --git a/website/src/pages/it/substreams/_meta.js b/website/src/pages/it/substreams/_meta.js
index e4021b86dbb8..628a69e671e8 100644
--- a/website/src/pages/it/substreams/_meta.js
+++ b/website/src/pages/it/substreams/_meta.js
@@ -5,4 +5,5 @@ export default {
   introduction: '',
   developing: titles.developing,
   publishing: '',
+  sps: titles.sps,
 }
diff --git a/website/src/pages/it/substreams/sps/_meta.js b/website/src/pages/it/substreams/sps/_meta.js
new file mode 100644
index 000000000000..86fcd3df5ec0
--- /dev/null
+++ b/website/src/pages/it/substreams/sps/_meta.js
@@ -0,0 +1,6 @@
+export default {
+  introduction: '',
+  triggers: '',
+  tutorial: '',
+  faq: '',
+}
diff --git a/website/src/pages/it/sps/sps-faq.mdx b/website/src/pages/it/substreams/sps/faq.mdx
similarity index 100%
rename from website/src/pages/it/sps/sps-faq.mdx
rename to website/src/pages/it/substreams/sps/faq.mdx
diff --git a/website/src/pages/it/sps/introduction.mdx b/website/src/pages/it/substreams/sps/introduction.mdx
similarity index 100%
rename from website/src/pages/it/sps/introduction.mdx
rename to website/src/pages/it/substreams/sps/introduction.mdx
diff --git a/website/src/pages/it/sps/triggers.mdx b/website/src/pages/it/substreams/sps/triggers.mdx
similarity index 100%
rename from website/src/pages/it/sps/triggers.mdx
rename to website/src/pages/it/substreams/sps/triggers.mdx
diff --git a/website/src/pages/it/sps/tutorial.mdx b/website/src/pages/it/substreams/sps/tutorial.mdx
similarity index 100%
rename from website/src/pages/it/sps/tutorial.mdx
rename to website/src/pages/it/substreams/sps/tutorial.mdx
diff --git a/website/src/pages/ja/sps/_meta.js b/website/src/pages/ja/sps/_meta.js
deleted file mode 100644
index 75c5e3094895..000000000000
--- a/website/src/pages/ja/sps/_meta.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export default {
-  introduction: '',
-  triggers: '',
-  tutorial: '',
-  'sps-faq': '',
-}
diff --git a/website/src/pages/ja/substreams/_meta-titles.json b/website/src/pages/ja/substreams/_meta-titles.json
index 1c58294c4bfc..b8799cc89251 100644
--- a/website/src/pages/ja/substreams/_meta-titles.json
+++ b/website/src/pages/ja/substreams/_meta-titles.json
@@ -1,3 +1,4 @@
 {
-  "developing": "開発"
+  "developing": "Developing",
+  "sps": "Substreams-powered Subgraphs"
 }
diff --git a/website/src/pages/ja/substreams/_meta.js b/website/src/pages/ja/substreams/_meta.js
index e4021b86dbb8..628a69e671e8 100644
--- a/website/src/pages/ja/substreams/_meta.js
+++ b/website/src/pages/ja/substreams/_meta.js
@@ -5,4 +5,5 @@ export default {
   introduction: '',
   developing: titles.developing,
   publishing: '',
+  sps: titles.sps,
 }
diff --git a/website/src/pages/ja/substreams/sps/_meta.js b/website/src/pages/ja/substreams/sps/_meta.js
new file mode 100644
index 000000000000..86fcd3df5ec0
--- /dev/null
+++ b/website/src/pages/ja/substreams/sps/_meta.js
@@ -0,0 +1,6 @@
+export default {
+  introduction: '',
+  triggers: '',
+  tutorial: '',
+  faq: '',
+}
diff --git a/website/src/pages/ja/sps/sps-faq.mdx b/website/src/pages/ja/substreams/sps/faq.mdx
similarity index 100%
rename from website/src/pages/ja/sps/sps-faq.mdx
rename to website/src/pages/ja/substreams/sps/faq.mdx
diff --git a/website/src/pages/ja/sps/introduction.mdx b/website/src/pages/ja/substreams/sps/introduction.mdx
similarity index 100%
rename from website/src/pages/ja/sps/introduction.mdx
rename to website/src/pages/ja/substreams/sps/introduction.mdx
diff --git a/website/src/pages/ja/sps/triggers.mdx b/website/src/pages/ja/substreams/sps/triggers.mdx
similarity index 100%
rename from website/src/pages/ja/sps/triggers.mdx
rename to website/src/pages/ja/substreams/sps/triggers.mdx
diff --git a/website/src/pages/ja/sps/tutorial.mdx b/website/src/pages/ja/substreams/sps/tutorial.mdx
similarity index 100%
rename from website/src/pages/ja/sps/tutorial.mdx
rename to website/src/pages/ja/substreams/sps/tutorial.mdx
diff --git a/website/src/pages/ko/sps/_meta.js b/website/src/pages/ko/sps/_meta.js
deleted file mode 100644
index 75c5e3094895..000000000000
--- a/website/src/pages/ko/sps/_meta.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export default {
-  introduction: '',
-  triggers: '',
-  tutorial: '',
-  'sps-faq': '',
-}
diff --git a/website/src/pages/ko/substreams/_meta-titles.json b/website/src/pages/ko/substreams/_meta-titles.json
index 6262ad528c3a..b8799cc89251 100644
--- a/website/src/pages/ko/substreams/_meta-titles.json
+++ b/website/src/pages/ko/substreams/_meta-titles.json
@@ -1,3 +1,4 @@
 {
-  "developing": "Developing"
+  "developing": "Developing",
+  "sps": "Substreams-powered Subgraphs"
 }
diff --git a/website/src/pages/ko/substreams/_meta.js b/website/src/pages/ko/substreams/_meta.js
index e4021b86dbb8..628a69e671e8 100644
--- a/website/src/pages/ko/substreams/_meta.js
+++ b/website/src/pages/ko/substreams/_meta.js
@@ -5,4 +5,5 @@ export default {
   introduction: '',
   developing: titles.developing,
   publishing: '',
+  sps: titles.sps,
 }
diff --git a/website/src/pages/ko/substreams/sps/_meta.js b/website/src/pages/ko/substreams/sps/_meta.js
new file mode 100644
index 000000000000..86fcd3df5ec0
--- /dev/null
+++ b/website/src/pages/ko/substreams/sps/_meta.js
@@ -0,0 +1,6 @@
+export default {
+  introduction: '',
+  triggers: '',
+  tutorial: '',
+  faq: '',
+}
diff --git a/website/src/pages/ko/sps/sps-faq.mdx b/website/src/pages/ko/substreams/sps/faq.mdx
similarity index 100%
rename from website/src/pages/ko/sps/sps-faq.mdx
rename to website/src/pages/ko/substreams/sps/faq.mdx
diff --git a/website/src/pages/ko/sps/introduction.mdx b/website/src/pages/ko/substreams/sps/introduction.mdx
similarity index 100%
rename from website/src/pages/ko/sps/introduction.mdx
rename to website/src/pages/ko/substreams/sps/introduction.mdx
diff --git a/website/src/pages/ko/sps/triggers.mdx b/website/src/pages/ko/substreams/sps/triggers.mdx
similarity index 100%
rename from website/src/pages/ko/sps/triggers.mdx
rename to website/src/pages/ko/substreams/sps/triggers.mdx
diff --git a/website/src/pages/ko/sps/tutorial.mdx b/website/src/pages/ko/substreams/sps/tutorial.mdx
similarity index 100%
rename from website/src/pages/ko/sps/tutorial.mdx
rename to website/src/pages/ko/substreams/sps/tutorial.mdx
diff --git a/website/src/pages/mr/sps/_meta.js b/website/src/pages/mr/sps/_meta.js
deleted file mode 100644
index 75c5e3094895..000000000000
--- a/website/src/pages/mr/sps/_meta.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export default {
-  introduction: '',
-  triggers: '',
-  tutorial: '',
-  'sps-faq': '',
-}
diff --git a/website/src/pages/mr/substreams/_meta-titles.json b/website/src/pages/mr/substreams/_meta-titles.json
index 6262ad528c3a..b8799cc89251 100644
--- a/website/src/pages/mr/substreams/_meta-titles.json
+++ b/website/src/pages/mr/substreams/_meta-titles.json
@@ -1,3 +1,4 @@
 {
-  "developing": "Developing"
+  "developing": "Developing",
+  "sps": "Substreams-powered Subgraphs"
 }
diff --git a/website/src/pages/mr/substreams/_meta.js b/website/src/pages/mr/substreams/_meta.js
index e4021b86dbb8..628a69e671e8 100644
--- a/website/src/pages/mr/substreams/_meta.js
+++ b/website/src/pages/mr/substreams/_meta.js
@@ -5,4 +5,5 @@ export default {
   introduction: '',
   developing: titles.developing,
   publishing: '',
+  sps: titles.sps,
 }
diff --git a/website/src/pages/mr/substreams/sps/_meta.js b/website/src/pages/mr/substreams/sps/_meta.js
new file mode 100644
index 000000000000..86fcd3df5ec0
--- /dev/null
+++ b/website/src/pages/mr/substreams/sps/_meta.js
@@ -0,0 +1,6 @@
+export default {
+  introduction: '',
+  triggers: '',
+  tutorial: '',
+  faq: '',
+}
diff --git a/website/src/pages/mr/sps/sps-faq.mdx b/website/src/pages/mr/substreams/sps/faq.mdx
similarity index 100%
rename from website/src/pages/mr/sps/sps-faq.mdx
rename to website/src/pages/mr/substreams/sps/faq.mdx
diff --git a/website/src/pages/mr/sps/introduction.mdx b/website/src/pages/mr/substreams/sps/introduction.mdx
similarity index 100%
rename from website/src/pages/mr/sps/introduction.mdx
rename to website/src/pages/mr/substreams/sps/introduction.mdx
diff --git a/website/src/pages/mr/sps/triggers.mdx b/website/src/pages/mr/substreams/sps/triggers.mdx
similarity index 100%
rename from website/src/pages/mr/sps/triggers.mdx
rename to website/src/pages/mr/substreams/sps/triggers.mdx
diff --git a/website/src/pages/mr/sps/tutorial.mdx b/website/src/pages/mr/substreams/sps/tutorial.mdx
similarity index 100%
rename from website/src/pages/mr/sps/tutorial.mdx
rename to website/src/pages/mr/substreams/sps/tutorial.mdx
diff --git a/website/src/pages/nl/sps/_meta.js b/website/src/pages/nl/sps/_meta.js
deleted file mode 100644
index 75c5e3094895..000000000000
--- a/website/src/pages/nl/sps/_meta.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export default {
-  introduction: '',
-  triggers: '',
-  tutorial: '',
-  'sps-faq': '',
-}
diff --git a/website/src/pages/nl/substreams/_meta-titles.json b/website/src/pages/nl/substreams/_meta-titles.json
index 6262ad528c3a..b8799cc89251 100644
--- a/website/src/pages/nl/substreams/_meta-titles.json
+++ b/website/src/pages/nl/substreams/_meta-titles.json
@@ -1,3 +1,4 @@
 {
-  "developing": "Developing"
+  "developing": "Developing",
+  "sps": "Substreams-powered Subgraphs"
 }
diff --git a/website/src/pages/nl/substreams/_meta.js b/website/src/pages/nl/substreams/_meta.js
index e4021b86dbb8..628a69e671e8 100644
--- a/website/src/pages/nl/substreams/_meta.js
+++ b/website/src/pages/nl/substreams/_meta.js
@@ -5,4 +5,5 @@ export default {
   introduction: '',
   developing: titles.developing,
   publishing: '',
+  sps: titles.sps,
 }
diff --git a/website/src/pages/nl/substreams/sps/_meta.js b/website/src/pages/nl/substreams/sps/_meta.js
new file mode 100644
index 000000000000..86fcd3df5ec0
--- /dev/null
+++ b/website/src/pages/nl/substreams/sps/_meta.js
@@ -0,0 +1,6 @@
+export default {
+  introduction: '',
+  triggers: '',
+  tutorial: '',
+  faq: '',
+}
diff --git a/website/src/pages/nl/sps/sps-faq.mdx b/website/src/pages/nl/substreams/sps/faq.mdx
similarity index 100%
rename from website/src/pages/nl/sps/sps-faq.mdx
rename to website/src/pages/nl/substreams/sps/faq.mdx
diff --git a/website/src/pages/nl/sps/introduction.mdx b/website/src/pages/nl/substreams/sps/introduction.mdx
similarity index 100%
rename from website/src/pages/nl/sps/introduction.mdx
rename to website/src/pages/nl/substreams/sps/introduction.mdx
diff --git a/website/src/pages/nl/sps/triggers.mdx b/website/src/pages/nl/substreams/sps/triggers.mdx
similarity index 100%
rename from website/src/pages/nl/sps/triggers.mdx
rename to website/src/pages/nl/substreams/sps/triggers.mdx
diff --git a/website/src/pages/nl/sps/tutorial.mdx b/website/src/pages/nl/substreams/sps/tutorial.mdx
similarity index 100%
rename from website/src/pages/nl/sps/tutorial.mdx
rename to website/src/pages/nl/substreams/sps/tutorial.mdx
diff --git a/website/src/pages/pl/sps/_meta.js b/website/src/pages/pl/sps/_meta.js
deleted file mode 100644
index 75c5e3094895..000000000000
--- a/website/src/pages/pl/sps/_meta.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export default {
-  introduction: '',
-  triggers: '',
-  tutorial: '',
-  'sps-faq': '',
-}
diff --git a/website/src/pages/pl/substreams/_meta-titles.json b/website/src/pages/pl/substreams/_meta-titles.json
index 6262ad528c3a..b8799cc89251 100644
--- a/website/src/pages/pl/substreams/_meta-titles.json
+++ b/website/src/pages/pl/substreams/_meta-titles.json
@@ -1,3 +1,4 @@
 {
-  "developing": "Developing"
+  "developing": "Developing",
+  "sps": "Substreams-powered Subgraphs"
 }
diff --git a/website/src/pages/pl/substreams/_meta.js b/website/src/pages/pl/substreams/_meta.js
index e4021b86dbb8..628a69e671e8 100644
--- a/website/src/pages/pl/substreams/_meta.js
+++ b/website/src/pages/pl/substreams/_meta.js
@@ -5,4 +5,5 @@ export default {
   introduction: '',
   developing: titles.developing,
   publishing: '',
+  sps: titles.sps,
 }
diff --git a/website/src/pages/pl/substreams/sps/_meta.js b/website/src/pages/pl/substreams/sps/_meta.js
new file mode 100644
index 000000000000..86fcd3df5ec0
--- /dev/null
+++ b/website/src/pages/pl/substreams/sps/_meta.js
@@ -0,0 +1,6 @@
+export default {
+  introduction: '',
+  triggers: '',
+  tutorial: '',
+  faq: '',
+}
diff --git a/website/src/pages/pl/sps/sps-faq.mdx b/website/src/pages/pl/substreams/sps/faq.mdx
similarity index 100%
rename from website/src/pages/pl/sps/sps-faq.mdx
rename to website/src/pages/pl/substreams/sps/faq.mdx
diff --git a/website/src/pages/pl/sps/introduction.mdx b/website/src/pages/pl/substreams/sps/introduction.mdx
similarity index 100%
rename from website/src/pages/pl/sps/introduction.mdx
rename to website/src/pages/pl/substreams/sps/introduction.mdx
diff --git a/website/src/pages/pl/sps/triggers.mdx b/website/src/pages/pl/substreams/sps/triggers.mdx
similarity index 100%
rename from website/src/pages/pl/sps/triggers.mdx
rename to website/src/pages/pl/substreams/sps/triggers.mdx
diff --git a/website/src/pages/pl/sps/tutorial.mdx b/website/src/pages/pl/substreams/sps/tutorial.mdx
similarity index 100%
rename from website/src/pages/pl/sps/tutorial.mdx
rename to website/src/pages/pl/substreams/sps/tutorial.mdx
diff --git a/website/src/pages/pt/sps/_meta.js b/website/src/pages/pt/sps/_meta.js
deleted file mode 100644
index 75c5e3094895..000000000000
--- a/website/src/pages/pt/sps/_meta.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export default {
-  introduction: '',
-  triggers: '',
-  tutorial: '',
-  'sps-faq': '',
-}
diff --git a/website/src/pages/pt/substreams/_meta-titles.json b/website/src/pages/pt/substreams/_meta-titles.json
index dfe7d12bd79a..b8799cc89251 100644
--- a/website/src/pages/pt/substreams/_meta-titles.json
+++ b/website/src/pages/pt/substreams/_meta-titles.json
@@ -1,3 +1,4 @@
 {
-  "developing": "Programação"
+  "developing": "Developing",
+  "sps": "Substreams-powered Subgraphs"
 }
diff --git a/website/src/pages/pt/substreams/_meta.js b/website/src/pages/pt/substreams/_meta.js
index e4021b86dbb8..628a69e671e8 100644
--- a/website/src/pages/pt/substreams/_meta.js
+++ b/website/src/pages/pt/substreams/_meta.js
@@ -5,4 +5,5 @@ export default {
   introduction: '',
   developing: titles.developing,
   publishing: '',
+  sps: titles.sps,
 }
diff --git a/website/src/pages/pt/substreams/sps/_meta.js b/website/src/pages/pt/substreams/sps/_meta.js
new file mode 100644
index 000000000000..86fcd3df5ec0
--- /dev/null
+++ b/website/src/pages/pt/substreams/sps/_meta.js
@@ -0,0 +1,6 @@
+export default {
+  introduction: '',
+  triggers: '',
+  tutorial: '',
+  faq: '',
+}
diff --git a/website/src/pages/pt/sps/sps-faq.mdx b/website/src/pages/pt/substreams/sps/faq.mdx
similarity index 100%
rename from website/src/pages/pt/sps/sps-faq.mdx
rename to website/src/pages/pt/substreams/sps/faq.mdx
diff --git a/website/src/pages/pt/sps/introduction.mdx b/website/src/pages/pt/substreams/sps/introduction.mdx
similarity index 100%
rename from website/src/pages/pt/sps/introduction.mdx
rename to website/src/pages/pt/substreams/sps/introduction.mdx
diff --git a/website/src/pages/pt/sps/triggers.mdx b/website/src/pages/pt/substreams/sps/triggers.mdx
similarity index 100%
rename from website/src/pages/pt/sps/triggers.mdx
rename to website/src/pages/pt/substreams/sps/triggers.mdx
diff --git a/website/src/pages/pt/sps/tutorial.mdx b/website/src/pages/pt/substreams/sps/tutorial.mdx
similarity index 100%
rename from website/src/pages/pt/sps/tutorial.mdx
rename to website/src/pages/pt/substreams/sps/tutorial.mdx
diff --git a/website/src/pages/ro/sps/_meta.js b/website/src/pages/ro/sps/_meta.js
deleted file mode 100644
index 75c5e3094895..000000000000
--- a/website/src/pages/ro/sps/_meta.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export default {
-  introduction: '',
-  triggers: '',
-  tutorial: '',
-  'sps-faq': '',
-}
diff --git a/website/src/pages/ro/substreams/_meta-titles.json b/website/src/pages/ro/substreams/_meta-titles.json
index 6262ad528c3a..b8799cc89251 100644
--- a/website/src/pages/ro/substreams/_meta-titles.json
+++ b/website/src/pages/ro/substreams/_meta-titles.json
@@ -1,3 +1,4 @@
 {
-  "developing": "Developing"
+  "developing": "Developing",
+  "sps": "Substreams-powered Subgraphs"
 }
diff --git a/website/src/pages/ro/substreams/_meta.js b/website/src/pages/ro/substreams/_meta.js
index e4021b86dbb8..628a69e671e8 100644
--- a/website/src/pages/ro/substreams/_meta.js
+++ b/website/src/pages/ro/substreams/_meta.js
@@ -5,4 +5,5 @@ export default {
   introduction: '',
   developing: titles.developing,
   publishing: '',
+  sps: titles.sps,
 }
diff --git a/website/src/pages/ro/substreams/sps/_meta.js b/website/src/pages/ro/substreams/sps/_meta.js
new file mode 100644
index 000000000000..86fcd3df5ec0
--- /dev/null
+++ b/website/src/pages/ro/substreams/sps/_meta.js
@@ -0,0 +1,6 @@
+export default {
+  introduction: '',
+  triggers: '',
+  tutorial: '',
+  faq: '',
+}
diff --git a/website/src/pages/ro/sps/sps-faq.mdx b/website/src/pages/ro/substreams/sps/faq.mdx
similarity index 100%
rename from website/src/pages/ro/sps/sps-faq.mdx
rename to website/src/pages/ro/substreams/sps/faq.mdx
diff --git a/website/src/pages/ro/sps/introduction.mdx b/website/src/pages/ro/substreams/sps/introduction.mdx
similarity index 100%
rename from website/src/pages/ro/sps/introduction.mdx
rename to website/src/pages/ro/substreams/sps/introduction.mdx
diff --git a/website/src/pages/ro/sps/triggers.mdx b/website/src/pages/ro/substreams/sps/triggers.mdx
similarity index 100%
rename from website/src/pages/ro/sps/triggers.mdx
rename to website/src/pages/ro/substreams/sps/triggers.mdx
diff --git a/website/src/pages/ro/sps/tutorial.mdx b/website/src/pages/ro/substreams/sps/tutorial.mdx
similarity index 100%
rename from website/src/pages/ro/sps/tutorial.mdx
rename to website/src/pages/ro/substreams/sps/tutorial.mdx
diff --git a/website/src/pages/ru/sps/_meta.js b/website/src/pages/ru/sps/_meta.js
deleted file mode 100644
index 75c5e3094895..000000000000
--- a/website/src/pages/ru/sps/_meta.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export default {
-  introduction: '',
-  triggers: '',
-  tutorial: '',
-  'sps-faq': '',
-}
diff --git a/website/src/pages/ru/substreams/_meta-titles.json b/website/src/pages/ru/substreams/_meta-titles.json
index b4353cede681..b8799cc89251 100644
--- a/website/src/pages/ru/substreams/_meta-titles.json
+++ b/website/src/pages/ru/substreams/_meta-titles.json
@@ -1,3 +1,4 @@
 {
-  "developing": "Разработка"
+  "developing": "Developing",
+  "sps": "Substreams-powered Subgraphs"
 }
diff --git a/website/src/pages/ru/substreams/_meta.js b/website/src/pages/ru/substreams/_meta.js
index e4021b86dbb8..628a69e671e8 100644
--- a/website/src/pages/ru/substreams/_meta.js
+++ b/website/src/pages/ru/substreams/_meta.js
@@ -5,4 +5,5 @@ export default {
   introduction: '',
   developing: titles.developing,
   publishing: '',
+  sps: titles.sps,
 }
diff --git a/website/src/pages/ru/substreams/sps/_meta.js b/website/src/pages/ru/substreams/sps/_meta.js
new file mode 100644
index 000000000000..86fcd3df5ec0
--- /dev/null
+++ b/website/src/pages/ru/substreams/sps/_meta.js
@@ -0,0 +1,6 @@
+export default {
+  introduction: '',
+  triggers: '',
+  tutorial: '',
+  faq: '',
+}
diff --git a/website/src/pages/ru/sps/sps-faq.mdx b/website/src/pages/ru/substreams/sps/faq.mdx
similarity index 100%
rename from website/src/pages/ru/sps/sps-faq.mdx
rename to website/src/pages/ru/substreams/sps/faq.mdx
diff --git a/website/src/pages/ru/sps/introduction.mdx b/website/src/pages/ru/substreams/sps/introduction.mdx
similarity index 100%
rename from website/src/pages/ru/sps/introduction.mdx
rename to website/src/pages/ru/substreams/sps/introduction.mdx
diff --git a/website/src/pages/ru/sps/triggers.mdx b/website/src/pages/ru/substreams/sps/triggers.mdx
similarity index 100%
rename from website/src/pages/ru/sps/triggers.mdx
rename to website/src/pages/ru/substreams/sps/triggers.mdx
diff --git a/website/src/pages/ru/sps/tutorial.mdx b/website/src/pages/ru/substreams/sps/tutorial.mdx
similarity index 100%
rename from website/src/pages/ru/sps/tutorial.mdx
rename to website/src/pages/ru/substreams/sps/tutorial.mdx
diff --git a/website/src/pages/sv/sps/_meta.js b/website/src/pages/sv/sps/_meta.js
deleted file mode 100644
index 75c5e3094895..000000000000
--- a/website/src/pages/sv/sps/_meta.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export default {
-  introduction: '',
-  triggers: '',
-  tutorial: '',
-  'sps-faq': '',
-}
diff --git a/website/src/pages/sv/substreams/_meta-titles.json b/website/src/pages/sv/substreams/_meta-titles.json
index 6262ad528c3a..b8799cc89251 100644
--- a/website/src/pages/sv/substreams/_meta-titles.json
+++ b/website/src/pages/sv/substreams/_meta-titles.json
@@ -1,3 +1,4 @@
 {
-  "developing": "Developing"
+  "developing": "Developing",
+  "sps": "Substreams-powered Subgraphs"
 }
diff --git a/website/src/pages/sv/substreams/_meta.js b/website/src/pages/sv/substreams/_meta.js
index e4021b86dbb8..628a69e671e8 100644
--- a/website/src/pages/sv/substreams/_meta.js
+++ b/website/src/pages/sv/substreams/_meta.js
@@ -5,4 +5,5 @@ export default {
   introduction: '',
   developing: titles.developing,
   publishing: '',
+  sps: titles.sps,
 }
diff --git a/website/src/pages/sv/substreams/sps/_meta.js b/website/src/pages/sv/substreams/sps/_meta.js
new file mode 100644
index 000000000000..86fcd3df5ec0
--- /dev/null
+++ b/website/src/pages/sv/substreams/sps/_meta.js
@@ -0,0 +1,6 @@
+export default {
+  introduction: '',
+  triggers: '',
+  tutorial: '',
+  faq: '',
+}
diff --git a/website/src/pages/sv/sps/sps-faq.mdx b/website/src/pages/sv/substreams/sps/faq.mdx
similarity index 100%
rename from website/src/pages/sv/sps/sps-faq.mdx
rename to website/src/pages/sv/substreams/sps/faq.mdx
diff --git a/website/src/pages/sv/sps/introduction.mdx b/website/src/pages/sv/substreams/sps/introduction.mdx
similarity index 100%
rename from website/src/pages/sv/sps/introduction.mdx
rename to website/src/pages/sv/substreams/sps/introduction.mdx
diff --git a/website/src/pages/sv/sps/triggers.mdx b/website/src/pages/sv/substreams/sps/triggers.mdx
similarity index 100%
rename from website/src/pages/sv/sps/triggers.mdx
rename to website/src/pages/sv/substreams/sps/triggers.mdx
diff --git a/website/src/pages/sv/sps/tutorial.mdx b/website/src/pages/sv/substreams/sps/tutorial.mdx
similarity index 100%
rename from website/src/pages/sv/sps/tutorial.mdx
rename to website/src/pages/sv/substreams/sps/tutorial.mdx
diff --git a/website/src/pages/tr/sps/_meta.js b/website/src/pages/tr/sps/_meta.js
deleted file mode 100644
index 75c5e3094895..000000000000
--- a/website/src/pages/tr/sps/_meta.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export default {
-  introduction: '',
-  triggers: '',
-  tutorial: '',
-  'sps-faq': '',
-}
diff --git a/website/src/pages/tr/substreams/_meta-titles.json b/website/src/pages/tr/substreams/_meta-titles.json
index 327533e4f629..b8799cc89251 100644
--- a/website/src/pages/tr/substreams/_meta-titles.json
+++ b/website/src/pages/tr/substreams/_meta-titles.json
@@ -1,3 +1,4 @@
 {
-  "developing": "Geliştirme"
+  "developing": "Developing",
+  "sps": "Substreams-powered Subgraphs"
 }
diff --git a/website/src/pages/tr/substreams/_meta.js b/website/src/pages/tr/substreams/_meta.js
index e4021b86dbb8..628a69e671e8 100644
--- a/website/src/pages/tr/substreams/_meta.js
+++ b/website/src/pages/tr/substreams/_meta.js
@@ -5,4 +5,5 @@ export default {
   introduction: '',
   developing: titles.developing,
   publishing: '',
+  sps: titles.sps,
 }
diff --git a/website/src/pages/tr/substreams/sps/_meta.js b/website/src/pages/tr/substreams/sps/_meta.js
new file mode 100644
index 000000000000..86fcd3df5ec0
--- /dev/null
+++ b/website/src/pages/tr/substreams/sps/_meta.js
@@ -0,0 +1,6 @@
+export default {
+  introduction: '',
+  triggers: '',
+  tutorial: '',
+  faq: '',
+}
diff --git a/website/src/pages/tr/sps/sps-faq.mdx b/website/src/pages/tr/substreams/sps/faq.mdx
similarity index 100%
rename from website/src/pages/tr/sps/sps-faq.mdx
rename to website/src/pages/tr/substreams/sps/faq.mdx
diff --git a/website/src/pages/tr/sps/introduction.mdx b/website/src/pages/tr/substreams/sps/introduction.mdx
similarity index 100%
rename from website/src/pages/tr/sps/introduction.mdx
rename to website/src/pages/tr/substreams/sps/introduction.mdx
diff --git a/website/src/pages/tr/sps/triggers.mdx b/website/src/pages/tr/substreams/sps/triggers.mdx
similarity index 100%
rename from website/src/pages/tr/sps/triggers.mdx
rename to website/src/pages/tr/substreams/sps/triggers.mdx
diff --git a/website/src/pages/tr/sps/tutorial.mdx b/website/src/pages/tr/substreams/sps/tutorial.mdx
similarity index 100%
rename from website/src/pages/tr/sps/tutorial.mdx
rename to website/src/pages/tr/substreams/sps/tutorial.mdx
diff --git a/website/src/pages/uk/sps/_meta.js b/website/src/pages/uk/sps/_meta.js
deleted file mode 100644
index 75c5e3094895..000000000000
--- a/website/src/pages/uk/sps/_meta.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export default {
-  introduction: '',
-  triggers: '',
-  tutorial: '',
-  'sps-faq': '',
-}
diff --git a/website/src/pages/uk/substreams/_meta-titles.json b/website/src/pages/uk/substreams/_meta-titles.json
index 6262ad528c3a..b8799cc89251 100644
--- a/website/src/pages/uk/substreams/_meta-titles.json
+++ b/website/src/pages/uk/substreams/_meta-titles.json
@@ -1,3 +1,4 @@
 {
-  "developing": "Developing"
+  "developing": "Developing",
+  "sps": "Substreams-powered Subgraphs"
 }
diff --git a/website/src/pages/uk/substreams/_meta.js b/website/src/pages/uk/substreams/_meta.js
index e4021b86dbb8..628a69e671e8 100644
--- a/website/src/pages/uk/substreams/_meta.js
+++ b/website/src/pages/uk/substreams/_meta.js
@@ -5,4 +5,5 @@ export default {
   introduction: '',
   developing: titles.developing,
   publishing: '',
+  sps: titles.sps,
 }
diff --git a/website/src/pages/uk/substreams/sps/_meta.js b/website/src/pages/uk/substreams/sps/_meta.js
new file mode 100644
index 000000000000..86fcd3df5ec0
--- /dev/null
+++ b/website/src/pages/uk/substreams/sps/_meta.js
@@ -0,0 +1,6 @@
+export default {
+  introduction: '',
+  triggers: '',
+  tutorial: '',
+  faq: '',
+}
diff --git a/website/src/pages/uk/sps/sps-faq.mdx b/website/src/pages/uk/substreams/sps/faq.mdx
similarity index 100%
rename from website/src/pages/uk/sps/sps-faq.mdx
rename to website/src/pages/uk/substreams/sps/faq.mdx
diff --git a/website/src/pages/uk/sps/introduction.mdx b/website/src/pages/uk/substreams/sps/introduction.mdx
similarity index 100%
rename from website/src/pages/uk/sps/introduction.mdx
rename to website/src/pages/uk/substreams/sps/introduction.mdx
diff --git a/website/src/pages/uk/sps/triggers.mdx b/website/src/pages/uk/substreams/sps/triggers.mdx
similarity index 100%
rename from website/src/pages/uk/sps/triggers.mdx
rename to website/src/pages/uk/substreams/sps/triggers.mdx
diff --git a/website/src/pages/uk/sps/tutorial.mdx b/website/src/pages/uk/substreams/sps/tutorial.mdx
similarity index 100%
rename from website/src/pages/uk/sps/tutorial.mdx
rename to website/src/pages/uk/substreams/sps/tutorial.mdx
diff --git a/website/src/pages/ur/sps/_meta.js b/website/src/pages/ur/sps/_meta.js
deleted file mode 100644
index 75c5e3094895..000000000000
--- a/website/src/pages/ur/sps/_meta.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export default {
-  introduction: '',
-  triggers: '',
-  tutorial: '',
-  'sps-faq': '',
-}
diff --git a/website/src/pages/ur/substreams/_meta-titles.json b/website/src/pages/ur/substreams/_meta-titles.json
index 6262ad528c3a..b8799cc89251 100644
--- a/website/src/pages/ur/substreams/_meta-titles.json
+++ b/website/src/pages/ur/substreams/_meta-titles.json
@@ -1,3 +1,4 @@
 {
-  "developing": "Developing"
+  "developing": "Developing",
+  "sps": "Substreams-powered Subgraphs"
 }
diff --git a/website/src/pages/ur/substreams/_meta.js b/website/src/pages/ur/substreams/_meta.js
index e4021b86dbb8..628a69e671e8 100644
--- a/website/src/pages/ur/substreams/_meta.js
+++ b/website/src/pages/ur/substreams/_meta.js
@@ -5,4 +5,5 @@ export default {
   introduction: '',
   developing: titles.developing,
   publishing: '',
+  sps: titles.sps,
 }
diff --git a/website/src/pages/ur/substreams/sps/_meta.js b/website/src/pages/ur/substreams/sps/_meta.js
new file mode 100644
index 000000000000..86fcd3df5ec0
--- /dev/null
+++ b/website/src/pages/ur/substreams/sps/_meta.js
@@ -0,0 +1,6 @@
+export default {
+  introduction: '',
+  triggers: '',
+  tutorial: '',
+  faq: '',
+}
diff --git a/website/src/pages/ur/sps/sps-faq.mdx b/website/src/pages/ur/substreams/sps/faq.mdx
similarity index 100%
rename from website/src/pages/ur/sps/sps-faq.mdx
rename to website/src/pages/ur/substreams/sps/faq.mdx
diff --git a/website/src/pages/ur/sps/introduction.mdx b/website/src/pages/ur/substreams/sps/introduction.mdx
similarity index 100%
rename from website/src/pages/ur/sps/introduction.mdx
rename to website/src/pages/ur/substreams/sps/introduction.mdx
diff --git a/website/src/pages/ur/sps/triggers.mdx b/website/src/pages/ur/substreams/sps/triggers.mdx
similarity index 100%
rename from website/src/pages/ur/sps/triggers.mdx
rename to website/src/pages/ur/substreams/sps/triggers.mdx
diff --git a/website/src/pages/ur/sps/tutorial.mdx b/website/src/pages/ur/substreams/sps/tutorial.mdx
similarity index 100%
rename from website/src/pages/ur/sps/tutorial.mdx
rename to website/src/pages/ur/substreams/sps/tutorial.mdx
diff --git a/website/src/pages/vi/sps/_meta.js b/website/src/pages/vi/sps/_meta.js
deleted file mode 100644
index 75c5e3094895..000000000000
--- a/website/src/pages/vi/sps/_meta.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export default {
-  introduction: '',
-  triggers: '',
-  tutorial: '',
-  'sps-faq': '',
-}
diff --git a/website/src/pages/vi/substreams/_meta-titles.json b/website/src/pages/vi/substreams/_meta-titles.json
index 6262ad528c3a..b8799cc89251 100644
--- a/website/src/pages/vi/substreams/_meta-titles.json
+++ b/website/src/pages/vi/substreams/_meta-titles.json
@@ -1,3 +1,4 @@
 {
-  "developing": "Developing"
+  "developing": "Developing",
+  "sps": "Substreams-powered Subgraphs"
 }
diff --git a/website/src/pages/vi/substreams/_meta.js b/website/src/pages/vi/substreams/_meta.js
index e4021b86dbb8..628a69e671e8 100644
--- a/website/src/pages/vi/substreams/_meta.js
+++ b/website/src/pages/vi/substreams/_meta.js
@@ -5,4 +5,5 @@ export default {
   introduction: '',
   developing: titles.developing,
   publishing: '',
+  sps: titles.sps,
 }
diff --git a/website/src/pages/vi/substreams/sps/_meta.js b/website/src/pages/vi/substreams/sps/_meta.js
new file mode 100644
index 000000000000..86fcd3df5ec0
--- /dev/null
+++ b/website/src/pages/vi/substreams/sps/_meta.js
@@ -0,0 +1,6 @@
+export default {
+  introduction: '',
+  triggers: '',
+  tutorial: '',
+  faq: '',
+}
diff --git a/website/src/pages/vi/sps/sps-faq.mdx b/website/src/pages/vi/substreams/sps/faq.mdx
similarity index 100%
rename from website/src/pages/vi/sps/sps-faq.mdx
rename to website/src/pages/vi/substreams/sps/faq.mdx
diff --git a/website/src/pages/vi/sps/introduction.mdx b/website/src/pages/vi/substreams/sps/introduction.mdx
similarity index 100%
rename from website/src/pages/vi/sps/introduction.mdx
rename to website/src/pages/vi/substreams/sps/introduction.mdx
diff --git a/website/src/pages/vi/sps/triggers.mdx b/website/src/pages/vi/substreams/sps/triggers.mdx
similarity index 100%
rename from website/src/pages/vi/sps/triggers.mdx
rename to website/src/pages/vi/substreams/sps/triggers.mdx
diff --git a/website/src/pages/vi/sps/tutorial.mdx b/website/src/pages/vi/substreams/sps/tutorial.mdx
similarity index 100%
rename from website/src/pages/vi/sps/tutorial.mdx
rename to website/src/pages/vi/substreams/sps/tutorial.mdx
diff --git a/website/src/pages/zh/sps/_meta.js b/website/src/pages/zh/sps/_meta.js
deleted file mode 100644
index 75c5e3094895..000000000000
--- a/website/src/pages/zh/sps/_meta.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export default {
-  introduction: '',
-  triggers: '',
-  tutorial: '',
-  'sps-faq': '',
-}
diff --git a/website/src/pages/zh/substreams/_meta-titles.json b/website/src/pages/zh/substreams/_meta-titles.json
index 91b4b56a38e6..b8799cc89251 100644
--- a/website/src/pages/zh/substreams/_meta-titles.json
+++ b/website/src/pages/zh/substreams/_meta-titles.json
@@ -1,3 +1,4 @@
 {
-  "developing": "开发"
+  "developing": "Developing",
+  "sps": "Substreams-powered Subgraphs"
 }
diff --git a/website/src/pages/zh/substreams/_meta.js b/website/src/pages/zh/substreams/_meta.js
index e4021b86dbb8..628a69e671e8 100644
--- a/website/src/pages/zh/substreams/_meta.js
+++ b/website/src/pages/zh/substreams/_meta.js
@@ -5,4 +5,5 @@ export default {
   introduction: '',
   developing: titles.developing,
   publishing: '',
+  sps: titles.sps,
 }
diff --git a/website/src/pages/zh/substreams/sps/_meta.js b/website/src/pages/zh/substreams/sps/_meta.js
new file mode 100644
index 000000000000..86fcd3df5ec0
--- /dev/null
+++ b/website/src/pages/zh/substreams/sps/_meta.js
@@ -0,0 +1,6 @@
+export default {
+  introduction: '',
+  triggers: '',
+  tutorial: '',
+  faq: '',
+}
diff --git a/website/src/pages/zh/sps/sps-faq.mdx b/website/src/pages/zh/substreams/sps/faq.mdx
similarity index 100%
rename from website/src/pages/zh/sps/sps-faq.mdx
rename to website/src/pages/zh/substreams/sps/faq.mdx
diff --git a/website/src/pages/zh/sps/introduction.mdx b/website/src/pages/zh/substreams/sps/introduction.mdx
similarity index 100%
rename from website/src/pages/zh/sps/introduction.mdx
rename to website/src/pages/zh/substreams/sps/introduction.mdx
diff --git a/website/src/pages/zh/sps/triggers.mdx b/website/src/pages/zh/substreams/sps/triggers.mdx
similarity index 100%
rename from website/src/pages/zh/sps/triggers.mdx
rename to website/src/pages/zh/substreams/sps/triggers.mdx
diff --git a/website/src/pages/zh/sps/tutorial.mdx b/website/src/pages/zh/substreams/sps/tutorial.mdx
similarity index 100%
rename from website/src/pages/zh/sps/tutorial.mdx
rename to website/src/pages/zh/substreams/sps/tutorial.mdx