diff --git a/docs/docs/00100-intro/00200-quickstarts/00100-react.md b/docs/docs/00100-intro/00200-quickstarts/00100-react.md
index 640fe20ed01..86160457a6a 100644
--- a/docs/docs/00100-intro/00200-quickstarts/00100-react.md
+++ b/docs/docs/00100-intro/00200-quickstarts/00100-react.md
@@ -30,7 +30,7 @@ Get a SpacetimeDB React app running in under 5 minutes.
     </StepText>
     <StepCode>
 ```bash
-spacetime dev --template react-ts my-spacetime-app
+spacetime dev --template react-ts
 ```
     </StepCode>
   </Step>
@@ -105,19 +105,19 @@ export const say_hello = spacetimedb.reducer((ctx) => {
     <StepCode>
 ```bash
 # Call the add reducer to insert a person
-spacetime call <database-name> add Alice
+spacetime call add Alice
 
 # Query the person table
-spacetime sql <database-name> "SELECT * FROM person"
+spacetime sql "SELECT * FROM person"
  name
 ---------
  "Alice"
 
 # Call say_hello to greet everyone
-spacetime call <database-name> say_hello
+spacetime call say_hello
 
 # View the module logs
-spacetime logs <database-name>
+spacetime logs
 2025-01-13T12:00:00.000000Z  INFO: Hello, Alice!
 2025-01-13T12:00:00.000000Z  INFO: Hello, World!
 ```
diff --git a/docs/docs/00100-intro/00200-quickstarts/00150-nextjs.md b/docs/docs/00100-intro/00200-quickstarts/00150-nextjs.md
index b9ef11feaba..49e5f15a9da 100644
--- a/docs/docs/00100-intro/00200-quickstarts/00150-nextjs.md
+++ b/docs/docs/00100-intro/00200-quickstarts/00150-nextjs.md
@@ -29,7 +29,7 @@ Get a SpacetimeDB Next.js app running in under 5 minutes.
     </StepText>
     <StepCode>
 ```bash
-spacetime dev --template nextjs-ts my-nextjs-app
+spacetime dev --template nextjs-ts
 ```
     </StepCode>
   </Step>
@@ -108,19 +108,19 @@ spacetimedb.reducer('say_hello', (ctx) => {
     <StepCode>
 ```bash
 # Call the add reducer to insert a person
-spacetime call my-nextjs-app add Alice
+spacetime call add Alice
 
 # Query the person table
-spacetime sql my-nextjs-app "SELECT * FROM person"
+spacetime sql "SELECT * FROM person"
  name
 ---------
  "Alice"
 
 # Call say_hello to greet everyone
-spacetime call my-nextjs-app say_hello
+spacetime call say_hello
 
 # View the module logs
-spacetime logs my-nextjs-app
+spacetime logs
 2025-01-13T12:00:00.000000Z  INFO: Hello, Alice!
 2025-01-13T12:00:00.000000Z  INFO: Hello, World!
 ```
diff --git a/docs/docs/00100-intro/00200-quickstarts/00150-vue.md b/docs/docs/00100-intro/00200-quickstarts/00150-vue.md
index 20fbcd2ae04..fb7f038fe1b 100644
--- a/docs/docs/00100-intro/00200-quickstarts/00150-vue.md
+++ b/docs/docs/00100-intro/00200-quickstarts/00150-vue.md
@@ -103,19 +103,19 @@ export const say_hello = spacetimedb.reducer((ctx) => {
     <StepCode>
 ```bash
 # Call the add reducer to insert a person
-spacetime call <database-name> add Alice
+spacetime call add Alice
 
 # Query the person table
-spacetime sql <database-name> "SELECT * FROM person"
+spacetime sql "SELECT * FROM person"
  name
 ---------
  "Alice"
 
 # Call say_hello to greet everyone
-spacetime call <database-name> say_hello
+spacetime call say_hello
 
 # View the module logs
-spacetime logs <database-name>
+spacetime logs
 2025-01-13T12:00:00.000000Z  INFO: Hello, Alice!
 2025-01-13T12:00:00.000000Z  INFO: Hello, World!
 ```
diff --git a/docs/docs/00100-intro/00200-quickstarts/00155-nuxt.md b/docs/docs/00100-intro/00200-quickstarts/00155-nuxt.md
index 31d0cfdc3d4..897a765c54d 100644
--- a/docs/docs/00100-intro/00200-quickstarts/00155-nuxt.md
+++ b/docs/docs/00100-intro/00200-quickstarts/00155-nuxt.md
@@ -107,19 +107,19 @@ spacetimedb.reducer('say_hello', (ctx) => {
     <StepCode>
 ```bash
 # Call the add reducer to insert a person
-spacetime call <database-name> add Alice
+spacetime call add Alice
 
 # Query the person table
-spacetime sql <database-name> "SELECT * FROM person"
+spacetime sql "SELECT * FROM person"
  name
 ---------
  "Alice"
 
 # Call say_hello to greet everyone
-spacetime call <database-name> say_hello
+spacetime call say_hello
 
 # View the module logs
-spacetime logs <database-name>
+spacetime logs
 2025-01-13T12:00:00.000000Z  INFO: Hello, Alice!
 2025-01-13T12:00:00.000000Z  INFO: Hello, World!
 ```
diff --git a/docs/docs/00100-intro/00200-quickstarts/00160-svelte.md b/docs/docs/00100-intro/00200-quickstarts/00160-svelte.md
index 9e16d418c14..905f5991829 100644
--- a/docs/docs/00100-intro/00200-quickstarts/00160-svelte.md
+++ b/docs/docs/00100-intro/00200-quickstarts/00160-svelte.md
@@ -103,19 +103,19 @@ export const say_hello = spacetimedb.reducer((ctx) => {
     <StepCode>
 ```bash
 # Call the add reducer to insert a person
-spacetime call <database-name> add Alice
+spacetime call add Alice
 
 # Query the person table
-spacetime sql <database-name> "SELECT * FROM person"
+spacetime sql "SELECT * FROM person"
  name
 ---------
  "Alice"
 
 # Call say_hello to greet everyone
-spacetime call <database-name> say_hello
+spacetime call say_hello
 
 # View the module logs
-spacetime logs <database-name>
+spacetime logs
 2025-01-13T12:00:00.000000Z  INFO: Hello, Alice!
 2025-01-13T12:00:00.000000Z  INFO: Hello, World!
 ```
diff --git a/docs/docs/00100-intro/00200-quickstarts/00165-angular.md b/docs/docs/00100-intro/00200-quickstarts/00165-angular.md
index 69592d1849c..2080845f708 100644
--- a/docs/docs/00100-intro/00200-quickstarts/00165-angular.md
+++ b/docs/docs/00100-intro/00200-quickstarts/00165-angular.md
@@ -105,19 +105,19 @@ spacetimedb.reducer('say_hello', (ctx) => {
     <StepCode>
 ```bash
 # Call the add reducer to insert a person
-spacetime call <database-name> add Alice
+spacetime call add Alice
 
 # Query the person table
-spacetime sql <database-name> "SELECT * FROM person"
+spacetime sql "SELECT * FROM person"
  name
 ---------
  "Alice"
 
 # Call say_hello to greet everyone
-spacetime call <database-name> say_hello
+spacetime call say_hello
 
 # View the module logs
-spacetime logs <database-name>
+spacetime logs
 2025-01-13T12:00:00.000000Z  INFO: Hello, Alice!
 2025-01-13T12:00:00.000000Z  INFO: Hello, World!
 ```
diff --git a/docs/docs/00100-intro/00200-quickstarts/00170-tanstack.md b/docs/docs/00100-intro/00200-quickstarts/00170-tanstack.md
index aaef274cf7c..46c2618bd9c 100644
--- a/docs/docs/00100-intro/00200-quickstarts/00170-tanstack.md
+++ b/docs/docs/00100-intro/00200-quickstarts/00170-tanstack.md
@@ -29,7 +29,7 @@ Get a SpacetimeDB app with TanStack Start running in under 5 minutes.
     <StepCode>
 
 ```bash
-spacetime dev --template tanstack-ts my-spacetime-app
+spacetime dev --template tanstack-ts
 ```
 
     </StepCode>
@@ -111,19 +111,19 @@ spacetimedb.reducer('say_hello', (ctx) => {
     <StepCode>
 ```bash
 # Call the add reducer to insert a person
-spacetime call <database-name> add Alice
+spacetime call add Alice
 
 # Query the person table
-spacetime sql <database-name> "SELECT * FROM person"
+spacetime sql "SELECT * FROM person"
  name
 ---------
  "Alice"
 
 # Call say_hello to greet everyone
-spacetime call <database-name> say_hello
+spacetime call say_hello
 
 # View the module logs
-spacetime logs <database-name>
+spacetime logs
 2025-01-13T12:00:00.000000Z  INFO: Hello, Alice!
 2025-01-13T12:00:00.000000Z  INFO: Hello, World!
 ```
diff --git a/docs/docs/00100-intro/00200-quickstarts/00175-remix.md b/docs/docs/00100-intro/00200-quickstarts/00175-remix.md
index b089224c131..2ed6eaad221 100644
--- a/docs/docs/00100-intro/00200-quickstarts/00175-remix.md
+++ b/docs/docs/00100-intro/00200-quickstarts/00175-remix.md
@@ -29,7 +29,7 @@ Get a SpacetimeDB Remix app running in under 5 minutes.
     </StepText>
     <StepCode>
 ```bash
-spacetime dev --template remix-ts my-remix-app
+spacetime dev --template remix-ts
 ```
     </StepCode>
   </Step>
@@ -107,19 +107,19 @@ spacetimedb.reducer('say_hello', (ctx) => {
     <StepCode>
 ```bash
 # Call the add reducer to insert a person
-spacetime call my-remix-app add Alice
+spacetime call add Alice
 
 # Query the person table
-spacetime sql my-remix-app "SELECT * FROM person"
+spacetime sql "SELECT * FROM person"
  name
 ---------
  "Alice"
 
 # Call say_hello to greet everyone
-spacetime call my-remix-app say_hello
+spacetime call say_hello
 
 # View the module logs
-spacetime logs my-remix-app
+spacetime logs
 2025-01-13T12:00:00.000000Z  INFO: Hello, Alice!
 2025-01-13T12:00:00.000000Z  INFO: Hello, World!
 ```
diff --git a/docs/docs/00100-intro/00200-quickstarts/00180-browser.md b/docs/docs/00100-intro/00200-quickstarts/00180-browser.md
index b8151e4bbe8..62dc10a5c4f 100644
--- a/docs/docs/00100-intro/00200-quickstarts/00180-browser.md
+++ b/docs/docs/00100-intro/00200-quickstarts/00180-browser.md
@@ -29,7 +29,7 @@ Get a SpacetimeDB app running in the browser with inline JavaScript.
     </StepText>
     <StepCode>
 ```bash
-spacetime dev --template browser-ts my-spacetime-app
+spacetime dev --template browser-ts
 ```
     </StepCode>
   </Step>
diff --git a/docs/docs/00100-intro/00200-quickstarts/00250-bun.md b/docs/docs/00100-intro/00200-quickstarts/00250-bun.md
index 94c2f2a6093..882dec50763 100644
--- a/docs/docs/00100-intro/00200-quickstarts/00250-bun.md
+++ b/docs/docs/00100-intro/00200-quickstarts/00250-bun.md
@@ -200,11 +200,11 @@ DbConnection.builder()
     <StepCode>
 ```bash
 # Call the add reducer to insert a person
-spacetime call <database-name> add Charlie
+spacetime call add Charlie
 
 # Query the person table
 
-spacetime sql <database-name> "SELECT \* FROM person"
+spacetime sql "SELECT \* FROM person"
 name
 
 ---
@@ -215,11 +215,11 @@ name
 
 # Call say_hello to greet everyone
 
-spacetime call <database-name> say_hello
+spacetime call say_hello
 
 # View the module logs
 
-spacetime logs <database-name>
+spacetime logs
 2025-01-13T12:00:00.000000Z INFO: Hello, Alice!
 2025-01-13T12:00:00.000000Z INFO: Hello, Bob!
 2025-01-13T12:00:00.000000Z INFO: Hello, Charlie!
diff --git a/docs/docs/00100-intro/00200-quickstarts/00275-deno.md b/docs/docs/00100-intro/00200-quickstarts/00275-deno.md
index 88ff46efbc2..5de84dff8ca 100644
--- a/docs/docs/00100-intro/00200-quickstarts/00275-deno.md
+++ b/docs/docs/00100-intro/00200-quickstarts/00275-deno.md
@@ -200,11 +200,11 @@ DbConnection.builder()
     <StepCode>
 ```bash
 # Call the add reducer to insert a person
-spacetime call <database-name> add Charlie
+spacetime call add Charlie
 
 # Query the person table
 
-spacetime sql <database-name> "SELECT \* FROM person"
+spacetime sql "SELECT \* FROM person"
 name
 
 ---
@@ -215,11 +215,11 @@ name
 
 # Call say_hello to greet everyone
 
-spacetime call <database-name> say_hello
+spacetime call say_hello
 
 # View the module logs
 
-spacetime logs <database-name>
+spacetime logs
 2025-01-13T12:00:00.000000Z INFO: Hello, Alice!
 2025-01-13T12:00:00.000000Z INFO: Hello, Bob!
 2025-01-13T12:00:00.000000Z INFO: Hello, Charlie!
diff --git a/docs/docs/00100-intro/00200-quickstarts/00300-nodejs.md b/docs/docs/00100-intro/00200-quickstarts/00300-nodejs.md
index b62cdf52c3e..963b8c10048 100644
--- a/docs/docs/00100-intro/00200-quickstarts/00300-nodejs.md
+++ b/docs/docs/00100-intro/00200-quickstarts/00300-nodejs.md
@@ -200,11 +200,11 @@ DbConnection.builder()
     <StepCode>
 ```bash
 # Call the add reducer to insert a person
-spacetime call <database-name> add Charlie
+spacetime call add Charlie
 
 # Query the person table
 
-spacetime sql <database-name> "SELECT \* FROM person"
+spacetime sql "SELECT \* FROM person"
 name
 
 ---
@@ -215,11 +215,11 @@ name
 
 # Call say_hello to greet everyone
 
-spacetime call <database-name> say_hello
+spacetime call say_hello
 
 # View the module logs
 
-spacetime logs <database-name>
+spacetime logs
 2025-01-13T12:00:00.000000Z INFO: Hello, Alice!
 2025-01-13T12:00:00.000000Z INFO: Hello, Bob!
 2025-01-13T12:00:00.000000Z INFO: Hello, Charlie!
diff --git a/docs/docs/00100-intro/00200-quickstarts/00400-typescript.md b/docs/docs/00100-intro/00200-quickstarts/00400-typescript.md
index 9bec287b892..3e8240756e9 100644
--- a/docs/docs/00100-intro/00200-quickstarts/00400-typescript.md
+++ b/docs/docs/00100-intro/00200-quickstarts/00400-typescript.md
@@ -29,7 +29,7 @@ Get a SpacetimeDB TypeScript app running in under 5 minutes.
     </StepText>
     <StepCode>
 ```bash
-spacetime dev --template basic-ts my-spacetime-app
+spacetime dev --template basic-ts
 ```
     </StepCode>
   </Step>
@@ -96,19 +96,19 @@ export const say_hello = spacetimedb.reducer((ctx) => {
     <StepCode>
 ```bash
 # Call the add reducer to insert a person
-spacetime call <database-name> add Alice
+spacetime call add Alice
 
 # Query the person table
-spacetime sql <database-name> "SELECT * FROM person"
+spacetime sql "SELECT * FROM person"
  name
 ---------
  "Alice"
 
 # Call say_hello to greet everyone
-spacetime call <database-name> say_hello
+spacetime call say_hello
 
 # View the module logs
-spacetime logs <database-name>
+spacetime logs
 2025-01-13T12:00:00.000000Z  INFO: Hello, Alice!
 2025-01-13T12:00:00.000000Z  INFO: Hello, World!
 ```
diff --git a/docs/docs/00100-intro/00200-quickstarts/00500-rust.md b/docs/docs/00100-intro/00200-quickstarts/00500-rust.md
index 6c9c0959852..b61fca97467 100644
--- a/docs/docs/00100-intro/00200-quickstarts/00500-rust.md
+++ b/docs/docs/00100-intro/00200-quickstarts/00500-rust.md
@@ -29,7 +29,7 @@ Get a SpacetimeDB Rust app running in under 5 minutes.
     </StepText>
     <StepCode>
 ```bash
-spacetime dev --template basic-rs my-spacetime-app
+spacetime dev --template basic-rs
 ```
     </StepCode>
   </Step>
@@ -95,19 +95,19 @@ pub fn say_hello(ctx: &ReducerContext) {
     <StepCode>
 ```bash
 # Call the add reducer to insert a person
-spacetime call my-spacetime-app add Alice
+spacetime call add Alice
 
 # Query the person table
-spacetime sql my-spacetime-app "SELECT * FROM person"
+spacetime sql "SELECT * FROM person"
  name
 ---------
  "Alice"
 
 # Call say_hello to greet everyone
-spacetime call my-spacetime-app say_hello
+spacetime call say_hello
 
 # View the module logs
-spacetime logs my-spacetime-app
+spacetime logs
 2025-01-13T12:00:00.000000Z  INFO: Hello, Alice!
 2025-01-13T12:00:00.000000Z  INFO: Hello, World!
 ```
diff --git a/docs/docs/00100-intro/00200-quickstarts/00600-c-sharp.md b/docs/docs/00100-intro/00200-quickstarts/00600-c-sharp.md
index d8ea9846369..a6692333446 100644
--- a/docs/docs/00100-intro/00200-quickstarts/00600-c-sharp.md
+++ b/docs/docs/00100-intro/00200-quickstarts/00600-c-sharp.md
@@ -40,7 +40,7 @@ dotnet workload install wasi-experimental
     </StepText>
     <StepCode>
 ```bash
-spacetime dev --template basic-cs my-spacetime-app
+spacetime dev --template basic-cs
 ```
     </StepCode>
   </Step>
@@ -111,19 +111,19 @@ public static partial class Module
     <StepCode>
 ```bash
 # Call the add reducer to insert a person
-spacetime call <database-name> Add Alice
+spacetime call Add Alice
 
 # Query the person table
-spacetime sql <database-name> "SELECT * FROM Person"
+spacetime sql "SELECT * FROM Person"
  name
 ---------
  "Alice"
 
 # Call say_hello to greet everyone
-spacetime call <database-name> SayHello
+spacetime call SayHello
 
 # View the module logs
-spacetime logs <database-name>
+spacetime logs
 2025-01-13T12:00:00.000000Z  INFO: Hello, Alice!
 2025-01-13T12:00:00.000000Z  INFO: Hello, World!
 ```
diff --git a/docs/docs/00100-intro/00200-quickstarts/00700-cpp.md b/docs/docs/00100-intro/00200-quickstarts/00700-cpp.md
index 3d7dcb68e2d..ef124d2a5ce 100644
--- a/docs/docs/00100-intro/00200-quickstarts/00700-cpp.md
+++ b/docs/docs/00100-intro/00200-quickstarts/00700-cpp.md
@@ -50,7 +50,7 @@ source ./emsdk_env.sh
     </StepText>
     <StepCode>
 ```bash
-spacetime dev --template basic-cpp my-spacetime-app
+spacetime dev --template basic-cpp
 ```
     </StepCode>
     <StepText>
@@ -110,16 +110,16 @@ SPACETIMEDB_REDUCER(say_hello, ReducerContext ctx) {
     <StepCode>
 ```bash
 # Insert a person
-spacetime call <database-name> add Alice
+spacetime call add Alice
 
 # Query the person table
-spacetime sql <database-name> "SELECT * FROM person"
+spacetime sql "SELECT * FROM person"
 
 # Call say_hello to greet everyone
-spacetime call <database-name> say_hello
+spacetime call say_hello
 
 # View the module logs
-spacetime logs <database-name>
+spacetime logs
 ```
     </StepCode>
   </Step>