diff --git a/contributing-guides/style-guide.de.md b/contributing-guides/style-guide.de.md
index 945626d5e8..535d803356 100644
--- a/contributing-guides/style-guide.de.md
+++ b/contributing-guides/style-guide.de.md
@@ -2,11 +2,11 @@
 
  Diese Seite listet alle Regeln für `tldr`-Seiten auf.
 
- ## Layout
+## Layout
 
  Eine Standard-`tldr`-Seite sollte dem folgenden Format entsprechen:
 
- ```
+```md
  # befehl
 
  > Kurze Beschreibung.
@@ -26,21 +26,21 @@
  Er wird automatisch bei jeder Pull Request ausgeführt,
  er kann aber auch manuell installiert werden, um seine Seiten schon vorher zu überprüfen:
 
- ```
+```sh
  npm install --global tldr-lint
  tldr-lint {{seite.md}}
- ```
+```
 
  Für andere Optionen von `tldr-lint`, wie zum Beispiel das Linten eines ganzen Verzeichnisses:
  [`tldr tldr-lint`](https://github.com/tldr-pages/tldr/blob/main/pages/common/tldr-lint.md). Alternativ, kann man auch den Alias `tldrl` verwenden.
 
  Viele Clients unterstützen die `--render` Flag zum Anzeigen einer Seite:
 
- ```
+```sh
  tldr --render {{seite.md}}
- ```
+```
 
- ## Token-Syntax
+## Token-Syntax
 
  Eingaben der Nutzer\*innen sollten die `{{Token}}`-Syntax benutzen,
  damit `tldr`-Clients sie hervorheben können.
@@ -77,15 +77,16 @@
  2. Dateiendungen, wie `.dll`.
  3. Befehle, wie `ls`.
 
- ## Serial Comma
+## Serial Comma
 
  Benutze für eine Liste von 3 oder mehr Elementen ein [serial comma](https://en.wikipedia.org/wiki/Serial_comma), um Mehrdeutigkeiten zu verhindern.
 
  > Delete the Git branches, tags and remotes.
 
  Das obige Beispiel nutzt kein serial comma und ist somit mehrdeutig:
- * Lösche die Git Branches namens `tags` und `remotes`.
- * Lösche die Git Branches und die Git Tags und die Git Remotes.
+
+- Lösche die Git Branches namens `tags` und `remotes`.
+- Lösche die Git Branches und die Git Tags und die Git Remotes.
 
  Dies kann durch ein Komma vor "and" oder "or" gelöst werden.
 
diff --git a/contributing-guides/style-guide.ko.md b/contributing-guides/style-guide.ko.md
index 43a9b03423..8b0dc2dc27 100644
--- a/contributing-guides/style-guide.ko.md
+++ b/contributing-guides/style-guide.ko.md
@@ -5,6 +5,7 @@
 ## 레이아웃
 
 각 페이지의 기본 포맷은 다음 템플릿과 일치해야 하며, 다음과 최대 8개의 명령어 예제를 포함해야 합니다:
+
 ```md
 # 명령어 이름
 
@@ -102,6 +103,7 @@ tldr --render path/to/tldr_page.md
 토큰을 선택할 때 다음의 가이드라인을 염두에 두십시오:
 
 ### Naming
+
 - 짧지만 설명적인 토큰을 사용하세요.
 - 파일 및 디렉토리 경로에 대한 참조의 경우: 
   `{{path/to/<placeholder>}}`의 포맷을 사용하세요.
@@ -125,7 +127,7 @@ tldr --render path/to/tldr_page.md
 - 만약 명령어가 파일 시스템이나 장치에 돌이킬 수 없는 변경을 수행하는 경우, 모든 예제를 생각 없이 복사하여 붙여넣을 수 없도록 작성하십시오.
   예를 들어 `ddrescue --force --no-scrape /dev/sda /dev/sdb` 대신에 `ddrescue --force --no-scrape {{/dev/sdX}} {{/dev/sdY}}`를 사용하고, *block device*에 `/dev/sda1` 대신 `{{/dev/sdXY}}` 자리 표시자를 사용하세요.
 - 명령어가 많은 수의 명령어를 포함할 수 있는 경우, 다음과 같이 생략하여 표현하세요.
-  `{{arg1 arg2 ...}}` 여러 옵션 중 하나가 가능한 경우 `{{either|or}}`로 작성합니다.
+  `{{argument1 argument2 ...}}` 여러 옵션 중 하나가 가능한 경우 `{{either|or}}`로 작성합니다.
 
 일반적으로, 토큰은 가능한 한 직관적이어야 합니다.
 명령을 사용하는 방법을 파악하고 값으로 채우십시오.
@@ -150,8 +152,9 @@ tldr --render path/to/tldr_page.md
 > Git brances, tags, remotes를 삭제하세요.
 
 위의 예는 직렬 쉼표를 사용하지 않으므로 다음 두 가지 중 하나를 의미할 수 있습니다.
-* `tags`와 `remotes`라는 Git branch들을 삭제하세요.
-* Git branches, Git tag, Git remotes를 모두 삭제하세요.
+
+- `tags`와 `remotes`라는 Git branch들을 삭제하세요.
+- Git branches, Git tag, Git remotes를 모두 삭제하세요.
 
 목록의 마지막 요소에서 "and" 또는 "or" 앞에 쉼표를 삽입하면 이 문제를 해결할 수 있습니다.
 
diff --git a/contributing-guides/style-guide.md b/contributing-guides/style-guide.md
index c0108428b1..bdf5a8f2d7 100644
--- a/contributing-guides/style-guide.md
+++ b/contributing-guides/style-guide.md
@@ -124,7 +124,7 @@ Keep the following guidelines in mind when choosing placeholders:
 - Use [`snake_case`](https://wikipedia.org/wiki/snake_case) for multi-word placeholders.
 - Use a generic placeholder rather than an actual value where a generic placeholder is available (but there is an exception to this listed below). For example, use
   `iostat {{1..infinity}}` rather than `iostat {{2}}`.
- - If there are several consecutive placeholders of the same type
+  - If there are several consecutive placeholders of the same type
   which don't allow adding arbitrary text in them (ranges), then instead of generic placeholders use descriptive ones. For example prefer `input swipe {{x_position}} {{y_position}} {{x_position}} {{y_position}} {{seconds}}`
   instead of `input swipe {{-infinity..infinity}} {{-infinity..infinity}} {{-infinity..infinity}} {{-infinity..infinity}} {{1..infinity}}`.
 
@@ -195,8 +195,9 @@ since omitting it can create ambiguity.
 > Delete the Git branches, tags and remotes.
 
 The example above does not use a serial comma, so this could mean one of two things:
-* Delete the Git branches named `tags` and `remotes`.
-* Delete all of the following: Git branches, Git tags, and Git remotes.
+
+- Delete the Git branches named `tags` and `remotes`.
+- Delete all of the following: Git branches, Git tags, and Git remotes.
 
 This can be resolved by inserting a comma before the "and" or "or" in the final element in the list.
 
@@ -206,7 +207,7 @@ This can be resolved by inserting a comma before the "and" or "or" in the final
 
 On the `More information` line, prefer linking to the author's provided documentation.
 
-When not available, use <https://manned.org> as the default fallback. 
+When not available, use <https://manned.org> as the default fallback.
 
 ## Language-Specific Rules
 
@@ -217,19 +218,30 @@ When Chinese words, Latin words and Arabic numerals are written in the same sent
 The following guidelines are applied to Chinese (`zh`) and traditional Chinese (`zh_TW`) pages:
 
 1. Place one space before/after English words and numbers.
-  - For example, use `列出所有 docker 容器` rather than `列出所有docker容器`.
-  - For example, use `宽度为 50 个字` rather than `宽度为50个字`.
+
+ - For example, use `列出所有 docker 容器` rather than `列出所有docker容器`.
+ - For example, use `宽度为 50 个字` rather than `宽度为50个字`.
+
 2. Place one space between numbers and units **except** degrees and percentages.
-  - For example, use `容量 50 MB` rather than `容量 50MB`.
-  - For instances of degree and percentage, use `50°C` and `50%` rather than `50 °C` and `50 %`.
+
+ - For example, use `容量 50 MB` rather than `容量 50MB`.
+ - For instances of degree and percentage, use `50°C` and `50%` rather than `50 °C` and `50 %`.
+
 3. No additional spaces before/after full-width punctuations.
-  - For example, use `开启 shell，进入交互模式` rather than `开启 shell ，进入交互模式`
+
+ - For example, use `开启 shell，进入交互模式` rather than `开启 shell ，进入交互模式`
+
 4. Use full-width punctuations except for long Latin clauses.
-  - For example, use `嗨，你好。` rather than `嗨, 你好.`
+
+ - For example, use `嗨，你好。` rather than `嗨, 你好.`
+
 5. Use a half-width punctuation to end a sentence when the last character is half-width.
+
   - For example, use `将代码转化为 Python 3.` rather than `将代码转化为 Python 3。`
+
 6. Use precise form for technical terms, and do not use unofficial Chinese abbreviations.
-  - For example, use `Facebook` rather than `facebook`, `fb` or `脸书`.
+
+ - For example, use `Facebook` rather than `facebook`, `fb` or `脸书`.
 
 In order to maintain readability and normalization, please comply with the 6 rules above as much as possible when translating pages into Chinese.
 
diff --git a/contributing-guides/style-guide.zh.md b/contributing-guides/style-guide.zh.md
index c5f180c94e..5273b0c876 100644
--- a/contributing-guides/style-guide.zh.md
+++ b/contributing-guides/style-guide.zh.md
@@ -8,7 +8,7 @@
 
 首先，你的页面应该看起来像这样：
 
-```
+```md
 # 命令名称
 
 > 短小精悍的描述。
@@ -28,7 +28,7 @@
 
 你也可以在提交前在本地测试自己的贡献：
 
-```
+```sh
 npm install --global tldr-lint
 tldr-lint {{page.md}}
 ```
@@ -37,11 +37,10 @@ tldr-lint {{page.md}}
 
 如果你用 tldr-pages 的 Node.js 客户端，你可以在命令后加 `-f` (`--render`) 来在本地预览自己的页面：
 
-```
+```sh
 tldr --render {{page.md}}
 ```
 
-
 ## 占位符（token）语法
 
 当命令涉及用户自己提供的值时，请用 `{{token}}` 语法来使 `tldr` 客户端自动高亮它们：
@@ -84,7 +83,7 @@ tldr --render {{page.md}}
 以下规则适用于中文（zh）和繁体中文（zh_TW）：
 
 1. 在西文单词和数字前后放置一个空格。  
-   例如：`列出所有 docker 容器` 而不是 `列出所有docker容器`。   
+   例如：`列出所有 docker 容器` 而不是 `列出所有docker容器`。  
    例如：`宽度为 50 个字` 而不是 `宽度为50个字`。
 2. 除了度数和百分比，在数字和单位之间留一个空格。  
    例如：`容量 50 MB` 而不是 `容量 50MB`。  
@@ -101,4 +100,3 @@ tldr --render {{page.md}}
 为保持可读性和一致性，将页面翻译成中文时，请尽可能遵守以上 6 条规则。
 
 有关更多中西文混排规则的信息，请参考 [《中文文案排版指北》](https://github.com/sparanoid/chinese-copywriting-guidelines)。
-
diff --git a/pages.ca/linux/cpulimit.md b/pages.ca/linux/cpulimit.md
index 57136a0cab..27d9530588 100644
--- a/pages.ca/linux/cpulimit.md
+++ b/pages.ca/linux/cpulimit.md
@@ -13,7 +13,7 @@
 
 - Executa un programa determinat i limita el seu ús a només el 50% de la CPU:
 
-`cpulimit --limit {{50}} -- {{programa arg1 arg2 ...}}`
+`cpulimit --limit {{50}} -- {{programa argument1 argument2 ...}}`
 
 - Executa un programa, limita l'ús de la CPU a 50% i executa cpulimit en segon pla:
 
diff --git a/pages.de/common/kubectl-run.md b/pages.de/common/kubectl-run.md
index e9cac927f8..dff2a690c9 100644
--- a/pages.de/common/kubectl-run.md
+++ b/pages.de/common/kubectl-run.md
@@ -21,4 +21,4 @@
 
 - Führe einen Ubuntu-Pod aus, überschreibe den Standardbefehl mit echo und gib eigene Argumente an:
 
-`kubectl run --generator=run-pod/v1 temp-ubuntu --image=ubuntu:20.04 --command -- echo arg1 arg2 arg3`
+`kubectl run --generator=run-pod/v1 temp-ubuntu --image=ubuntu:20.04 --command -- echo {{argument1 argument2 ...}}`
diff --git a/pages.de/common/nix-shell.md b/pages.de/common/nix-shell.md
index e537da4615..ef5e8770fc 100644
--- a/pages.de/common/nix-shell.md
+++ b/pages.de/common/nix-shell.md
@@ -9,7 +9,7 @@
 
 - Führe Shell-Befehl in nicht-interaktiver Shell aus und beende:
 
-`nix-shell --run "{{befehl}} {{arg1 arg2 ...}}"`
+`nix-shell --run "{{befehl}} {{argument1 argument2 ...}}"`
 
 - Starte mit Ausdruck in `default.nix` im aktuellen Verzeichnis:
 
diff --git a/pages.es/linux/cpulimit.md b/pages.es/linux/cpulimit.md
index 6b8397731f..0bbf5ad5ad 100644
--- a/pages.es/linux/cpulimit.md
+++ b/pages.es/linux/cpulimit.md
@@ -13,7 +13,7 @@
 
 - Ejecuta un programa determinado y limita su uso a solo el 50% del CPU:
 
-`cpulimit --limit {{50}} -- {{programa arg1 arg2 ...}}`
+`cpulimit --limit {{50}} -- {{programa argument1 argument2 ...}}`
 
 - Ejecuta un programa, limita el uso del CPU a 50% y corre cpulimit en segundo plano:
 
diff --git a/pages.pt_BR/common/mvn.md b/pages.pt_BR/common/mvn.md
index 250eaca48f..9b3ef5379f 100644
--- a/pages.pt_BR/common/mvn.md
+++ b/pages.pt_BR/common/mvn.md
@@ -33,4 +33,4 @@
 
 - Executar uma classe que possua o método `main`:
 
-`mvn exec:java -Dexec.mainClass="{{nome.do.pacote.classe}}" -Dexec.args="{{arg1 arg2}}"`
+`mvn exec:java -Dexec.mainClass="{{nome.do.pacote.classe}}" -Dexec.args="{{argument1 argument2 ...}}"`
diff --git a/pages/android/cmd.md b/pages/android/cmd.md
index 0a4d259472..35215baa97 100644
--- a/pages/android/cmd.md
+++ b/pages/android/cmd.md
@@ -13,4 +13,4 @@
 
 - Call a service with specific arguments:
 
-`cmd {{service}} {{arg1 arg2 ...}}`
+`cmd {{service}} {{argument1 argument2 ...}}`
diff --git a/pages/common/apm.md b/pages/common/apm.md
index 0ffc95a9ca..014bbb25e6 100644
--- a/pages/common/apm.md
+++ b/pages/common/apm.md
@@ -6,12 +6,12 @@
 
 - Install a package from http://atom.io/packages or a theme from http://atom.io/themes:
 
-`apm install {{package_name}}`
+`apm install {{package}}`
 
 - Remove a package/theme:
 
-`apm remove {{package_name}}`
+`apm remove {{package}}`
 
 - Upgrade a package/theme:
 
-`apm upgrade {{package_name}}`
+`apm upgrade {{package}}`
diff --git a/pages/common/cabal.md b/pages/common/cabal.md
index 8c018aea84..927a5d39ac 100644
--- a/pages/common/cabal.md
+++ b/pages/common/cabal.md
@@ -10,11 +10,11 @@
 
 - Show information about a package:
 
-`cabal info {{package_name}}`
+`cabal info {{package}}`
 
 - Download and install a package:
 
-`cabal install {{package_name}}`
+`cabal install {{package}}`
 
 - Create a new Haskell project in the current directory:
 
diff --git a/pages/common/composer.md b/pages/common/composer.md
index 40850ffa12..c9df51033b 100644
--- a/pages/common/composer.md
+++ b/pages/common/composer.md
@@ -9,7 +9,7 @@
 
 - Add a package as a dependency for this project, adding it to `composer.json`:
 
-`composer require {{user/package_name}}`
+`composer require {{user/package}}`
 
 - Install all the dependencies in this project's `composer.json` and create `composer.lock`:
 
@@ -17,7 +17,7 @@
 
 - Uninstall a package from this project, removing it as a dependency from `composer.json`:
 
-`composer remove {{user/package_name}}`
+`composer remove {{user/package}}`
 
 - Update all the dependencies in this project's `composer.json` and note versions in `composer.lock` file:
 
@@ -29,7 +29,7 @@
 
 - Learn more about why a dependency can't be installed:
 
-`composer why-not {{user/package_name}}`
+`composer why-not {{user/package}}`
 
 - Update composer to its latest version:
 
diff --git a/pages/common/conda-create.md b/pages/common/conda-create.md
index 133531b3cb..229f1f5479 100644
--- a/pages/common/conda-create.md
+++ b/pages/common/conda-create.md
@@ -13,4 +13,4 @@
 
 - Create a new environment with a specified name and install a given package:
 
-`conda create --name {{env_name}} {{package_name}}`
+`conda create --name {{env_name}} {{package}}`
diff --git a/pages/common/cordova.md b/pages/common/cordova.md
index d3267d7722..f83b0d63f2 100644
--- a/pages/common/cordova.md
+++ b/pages/common/cordova.md
@@ -5,7 +5,7 @@
 
 - Create a Cordova project:
 
-`cordova create {{path}} {{package_name}} {{project_name}}`
+`cordova create {{path/to/directory}} {{package}} {{project_name}}`
 
 - Display the current workspace status:
 
diff --git a/pages/common/cradle-elastic.md b/pages/common/cradle-elastic.md
index a7b40141ea..4c9b7e980f 100644
--- a/pages/common/cradle-elastic.md
+++ b/pages/common/cradle-elastic.md
@@ -9,7 +9,7 @@
 
 - Truncate the Elasticsearch index for a specific package:
 
-`cradle elastic flush {{package_name}}`
+`cradle elastic flush {{package}}`
 
 - Submit the Elasticsearch schema:
 
@@ -17,7 +17,7 @@
 
 - Submit the Elasticsearch schema for a specific package:
 
-`cradle elastic map {{package_name}}`
+`cradle elastic map {{package}}`
 
 - Populate the Elasticsearch indices for all packages:
 
@@ -25,4 +25,4 @@
 
 - Populate the Elasticsearch indices for a specific package:
 
-`cradle elastic populate {{package_name}}`
+`cradle elastic populate {{package}}`
diff --git a/pages/common/cradle-sql.md b/pages/common/cradle-sql.md
index d534d33193..726abbd98e 100644
--- a/pages/common/cradle-sql.md
+++ b/pages/common/cradle-sql.md
@@ -9,7 +9,7 @@
 
 - Rebuild the database schema for a specific package:
 
-`cradle sql build {{package_name}}`
+`cradle sql build {{package}}`
 
 - Empty the entire database:
 
@@ -17,7 +17,7 @@
 
 - Empty the database tables for a specific package:
 
-`cradle sql flush {{package_name}}`
+`cradle sql flush {{package}}`
 
 - Populate the tables for all packages:
 
@@ -25,4 +25,4 @@
 
 - Populate the tables for a specific package:
 
-`cradle sql populate {{package_name}}`
+`cradle sql populate {{package}}`
diff --git a/pages/common/cs-launch.md b/pages/common/cs-launch.md
index 508c051183..43f98315ca 100644
--- a/pages/common/cs-launch.md
+++ b/pages/common/cs-launch.md
@@ -5,11 +5,11 @@
 
 - Launch a specific application with arguments:
 
-`cs launch {{application_name}} -- {{arg1 arg2 ...}}`
+`cs launch {{application_name}} -- {{argument1 argument2 ...}}`
 
 - Launch a specific application version with arguments:
 
-`cs launch {{application_name}}:{{application_version}} -- {{arg1 arg2 ...}}`
+`cs launch {{application_name}}:{{application_version}} -- {{argument1 argument2 ...}}`
 
 - Launch a specific version of an application specifying which is the main file:
 
diff --git a/pages/common/espanso.md b/pages/common/espanso.md
index 5e6fbb1c8c..a2e59899cc 100644
--- a/pages/common/espanso.md
+++ b/pages/common/espanso.md
@@ -13,7 +13,7 @@
 
 - Install a package from the hub store (<https://hub.espanso.org/>):
 
-`espanso install {{package_name}}`
+`espanso install {{package}}`
 
 - Restart (required after installing a package, useful in case of failure):
 
diff --git a/pages/common/kubectl-run.md b/pages/common/kubectl-run.md
index ddf6421152..a7cd0f6c6c 100644
--- a/pages/common/kubectl-run.md
+++ b/pages/common/kubectl-run.md
@@ -5,20 +5,20 @@
 
 - Run an nginx pod and expose port 80:
 
-`kubectl run --generator=run-pod/v1 nginx --image=nginx --port 80`
+`kubectl run {{nginx-dev}} --image=nginx --port 80`
 
 - Run an nginx pod, setting the TEST_VAR environment variable:
 
-`kubectl run --generator=run-pod/v1 nginx --image=nginx --env="TEST_VAR=testing"`
+`kubectl run {{nginx-dev}} --image=nginx --env="{{TEST_VAR}}={{testing}}"`
 
 - Show API calls that would be made to create an nginx container:
 
-`kubectl run --generator=run-pod/v1 nginx --image=nginx --dry-run`
+`kubectl run {{nginx-dev}} --image=nginx --dry-run={{none|server|client}}`
 
 - Run an Ubuntu pod interactively, never restart it, and remove it when it exits:
 
-`kubectl run --generator=run-pod/v1 -it temp-ubuntu --image=ubuntu:20.04 --restart=Never --rm -- /bin/bash`
+`kubectl run {{temp-ubuntu}} --image=ubuntu:22.04 --restart=Never --rm -- /bin/bash`
 
 - Run an Ubuntu pod, overriding the default command with echo, and specifying custom arguments:
 
-`kubectl run --generator=run-pod/v1 temp-ubuntu --image=ubuntu:20.04 --command -- echo arg1 arg2 arg3`
+`kubectl run {{temp-ubuntu}} --image=ubuntu:22.04 --command -- echo {{argument1 argument2 ...}}`
diff --git a/pages/common/mamba-repoquery.md b/pages/common/mamba-repoquery.md
index 8655e9f3f3..5e8e7b2903 100644
--- a/pages/common/mamba-repoquery.md
+++ b/pages/common/mamba-repoquery.md
@@ -5,7 +5,7 @@
 
 - Search for all available versions of a particular package:
 
-`mamba repoquery search {{package_name}}`
+`mamba repoquery search {{package}}`
 
 - Search for all packages satisfying specific constraints:
 
diff --git a/pages/common/meteor.md b/pages/common/meteor.md
index 833de3e91f..51a225135c 100644
--- a/pages/common/meteor.md
+++ b/pages/common/meteor.md
@@ -17,11 +17,11 @@
 
 - Add a package to the project:
 
-`meteor add {{package_name}}`
+`meteor add {{package}}`
 
 - Remove a package from the project:
 
-`meteor remove {{package_name}}`
+`meteor remove {{package}}`
 
 - Create a production build of the project as a tarball under the given directory:
 
diff --git a/pages/common/minifab.md b/pages/common/minifab.md
index e6e2213589..f7fb11b3ab 100644
--- a/pages/common/minifab.md
+++ b/pages/common/minifab.md
@@ -25,7 +25,7 @@
 
 - Invoke a chaincode method with the specified arguments:
 
-`minifab invoke -n {{chaincode_name}} -p '"{{method_name}}", "{{arg0}}", "{{arg1}}", ...'`
+`minifab invoke -n {{chaincode_name}} -p '"{{method_name}}", "{{argument1}}", "{{argument2}}", ...'`
 
 - Make a query on the ledger:
 
diff --git a/pages/common/mvn.md b/pages/common/mvn.md
index 291b250fe1..2233985c0d 100644
--- a/pages/common/mvn.md
+++ b/pages/common/mvn.md
@@ -34,4 +34,4 @@
 
 - Run a class with a main method:
 
-`mvn exec:java -Dexec.mainClass="{{com.example.Main}}" -Dexec.args="{{arg1 arg2}}"`
+`mvn exec:java -Dexec.mainClass="{{com.example.Main}}" -Dexec.args="{{argument1 argument2 ...}}"`
diff --git a/pages/common/nimble.md b/pages/common/nimble.md
index 70a3246c3a..b62b4b7fdc 100644
--- a/pages/common/nimble.md
+++ b/pages/common/nimble.md
@@ -10,7 +10,7 @@
 
 - Install a package:
 
-`nimble install {{package_name}}`
+`nimble install {{package}}`
 
 - List installed packages:
 
diff --git a/pages/common/nix-shell.md b/pages/common/nix-shell.md
index 46ce588479..12d4be4d06 100644
--- a/pages/common/nix-shell.md
+++ b/pages/common/nix-shell.md
@@ -10,7 +10,7 @@
 
 - Run shell command in non-interactive shell and exit:
 
-`nix-shell --run "{{command}} {{arg1 arg2 ...}}"`
+`nix-shell --run "{{command}} {{argument1 argument2 ...}}"`
 
 - Start with expression in `default.nix` in the current directory:
 
@@ -18,12 +18,12 @@
 
 - Start with packages loaded from nixpkgs:
 
-`nix-shell --packages {{package_name_1 package_name_2 ...}}`
+`nix-shell --packages {{package1 package2 ...}}`
 
 - Start with packages loaded from specific nixpkgs revision:
 
-`nix-shell --packages {{package_name_1 package_name_2 ...}} -I nixpkgs={{https://github.com/NixOS/nixpkgs/archive/nixpkgs_revision.tar.gz}}`
+`nix-shell --packages {{package1 package2 ...}} -I nixpkgs={{https://github.com/NixOS/nixpkgs/archive/nixpkgs_revision.tar.gz}}`
 
 - Evaluate rest of file in specific interpreter, for use in `#!-scripts` (see <https://nixos.org/manual/nix/stable/#use-as-a-interpreter>):
 
-`nix-shell -i {{interpreter}} --packages {{package_name_1 package_name_2 ...}}`
+`nix-shell -i {{interpreter}} --packages {{package1 package2 ...}}`
diff --git a/pages/common/npm-query.md b/pages/common/npm-query.md
index 19735925c9..3559d51e25 100644
--- a/pages/common/npm-query.md
+++ b/pages/common/npm-query.md
@@ -13,11 +13,11 @@
 
 - Print dependencies with a specific name:
 
-`npm query '#{{package_name}}'`
+`npm query '#{{package}}'`
 
 - Print dependencies with a specific name and within a semantic versioning range:
 
-`npm query #{{package_name}}@{{semantic_version}}`
+`npm query #{{package}}@{{semantic_version}}`
 
 - Print dependencies which have no dependencies:
 
diff --git a/pages/common/npm-why.md b/pages/common/npm-why.md
index 561548c674..15e9bfe021 100644
--- a/pages/common/npm-why.md
+++ b/pages/common/npm-why.md
@@ -5,4 +5,4 @@
 
 - Show why an npm package is installed:
 
-`npm-why {{package_name}}`
+`npm-why {{package}}`
diff --git a/pages/common/npx.md b/pages/common/npx.md
index 360bb2aefb..7db7365041 100644
--- a/pages/common/npx.md
+++ b/pages/common/npx.md
@@ -5,19 +5,19 @@
 
 - Execute the command from a local or remote `npm` package:
 
-`npx {{command}} {{arg1 arg2 ...}}`
+`npx {{command}} {{argument1 argument2 ...}}`
 
-- In case multiple commands with the same name exist, it is possible to specify the package name:
+- In case multiple commands with the same name exist, it is possible to explicitly specify the package:
 
-`npx --package {{package_name}} {{command}}`
+`npx --package {{package}} {{command}}`
 
 - Run a command if it exists in the current path or in `node_modules/.bin`:
 
-`npx --no-install {{command}} {{command_arguments}}`
+`npx --no-install {{command}} {{argument1 argument2 ...}}`
 
 - Execute a specific command suppressing any output from `npx` itself:
 
-`npx --quiet {{command}} {{arg1 arg2 ...}}`
+`npx --quiet {{command}} {{argument1 argument2 ...}}`
 
 - Display help:
 
diff --git a/pages/common/opam.md b/pages/common/opam.md
index 06a971b8a9..5e1780f7a2 100644
--- a/pages/common/opam.md
+++ b/pages/common/opam.md
@@ -10,15 +10,15 @@
 
 - Search for packages:
 
-`opam search {{package_name}}`
+`opam search {{query}}`
 
 - Install a package and all of its dependencies:
 
-`opam install {{package_name}}`
+`opam install {{package}}`
 
 - Display detailed information about a package:
 
-`opam show {{package_name}}`
+`opam show {{package}}`
 
 - List all installed packages:
 
diff --git a/pages/common/pio-package.md b/pages/common/pio-package.md
index 1c375f5b6f..d6613d3726 100644
--- a/pages/common/pio-package.md
+++ b/pages/common/pio-package.md
@@ -26,12 +26,12 @@
 
 - Remove all versions of a published package from the registry:
 
-`pio package unpublish {{package_name}}`
+`pio package unpublish {{package}}`
 
 - Remove a specific version of a published package from the registry:
 
-`pio package unpublish {{package_name}}@{{version}}`
+`pio package unpublish {{package}}@{{version}}`
 
 - Undo the removal, putting all versions or a specific version of the package back into the registry:
 
-`pio package unpublish --undo {{package_name}}@{{version}}`
+`pio package unpublish --undo {{package}}@{{version}}`
diff --git a/pages/common/pip-install.md b/pages/common/pip-install.md
index e7d5286154..bbf3410f75 100644
--- a/pages/common/pip-install.md
+++ b/pages/common/pip-install.md
@@ -5,11 +5,11 @@
 
 - Install a package:
 
-`pip install {{package_name}}`
+`pip install {{package}}`
 
 - Install a specific version of a package:
 
-`pip install {{package_name}}=={{package_version}}`
+`pip install {{package}}=={{version}}`
 
 - Install packages listed in a file:
 
diff --git a/pages/common/pip-uninstall.md b/pages/common/pip-uninstall.md
index fd3c056c7d..51be163f84 100644
--- a/pages/common/pip-uninstall.md
+++ b/pages/common/pip-uninstall.md
@@ -5,7 +5,7 @@
 
 - Uninstall a package:
 
-`pip uninstall {{package_name}}`
+`pip uninstall {{package}}`
 
 - Uninstall packages listed in a specific file:
 
@@ -13,4 +13,4 @@
 
 - Uninstall package without asking for confirmation:
 
-`pip uninstall --yes {{package_name}}`
+`pip uninstall --yes {{package}}`
diff --git a/pages/common/pip.md b/pages/common/pip.md
index 72ae925cd6..300c7527dc 100644
--- a/pages/common/pip.md
+++ b/pages/common/pip.md
@@ -6,7 +6,7 @@
 
 - Install a package (see `pip install` for more install examples):
 
-`pip install {{package_name}}`
+`pip install {{package}}`
 
 - Install a package to the user's directory instead of the system-wide default location:
 
@@ -14,11 +14,11 @@
 
 - Upgrade a package:
 
-`pip install --upgrade {{package_name}}`
+`pip install --upgrade {{package}}`
 
 - Uninstall a package:
 
-`pip uninstall {{package_name}}`
+`pip uninstall {{package}}`
 
 - Save installed packages to file:
 
@@ -26,7 +26,7 @@
 
 - Show installed package info:
 
-`pip show {{package_name}}`
+`pip show {{package}}`
 
 - Install packages from a file:
 
diff --git a/pages/common/pip3.md b/pages/common/pip3.md
index 8284250e23..2437bf8f1d 100644
--- a/pages/common/pip3.md
+++ b/pages/common/pip3.md
@@ -3,25 +3,21 @@
 > Python package manager.
 > More information: <https://pip.pypa.io>.
 
-- Find available packages:
-
-`pip3 search {{package_name}}`
-
 - Install a package:
 
-`pip3 install {{package_name}}`
+`pip3 install {{package}}`
 
 - Install a specific version of a package:
 
-`pip3 install {{package_name}}=={{package_version}}`
+`pip3 install {{package}}=={{version}}`
 
 - Upgrade a package:
 
-`pip3 install --upgrade {{package_name}}`
+`pip3 install --upgrade {{package}}`
 
 - Uninstall a package:
 
-`pip3 uninstall {{package_name}}`
+`pip3 uninstall {{package}}`
 
 - Save the list of installed packages to a file:
 
@@ -33,4 +29,4 @@
 
 - Show installed package info:
 
-`pip3 show {{package_name}}`
+`pip3 show {{package}}`
diff --git a/pages/common/pipenv.md b/pages/common/pipenv.md
index 9f4e064ce5..0cfebb801d 100644
--- a/pages/common/pipenv.md
+++ b/pages/common/pipenv.md
@@ -14,7 +14,7 @@
 
 - Install a package:
 
-`pipenv install {{package_name}}`
+`pipenv install {{package}}`
 
 - Install all the dependencies for a project:
 
@@ -26,7 +26,7 @@
 
 - Uninstall a package:
 
-`pipenv uninstall {{package_name}}`
+`pipenv uninstall {{package}}`
 
 - Start a shell within the created virtual environment:
 
diff --git a/pages/common/pypy.md b/pages/common/pypy.md
index 7b2a06bf3d..3438265fcd 100644
--- a/pages/common/pypy.md
+++ b/pages/common/pypy.md
@@ -25,7 +25,7 @@
 
 - Install a package using pip:
 
-`pypy -m pip install {{package_name}}`
+`pypy -m pip install {{package}}`
 
 - Interactively debug a Python script:
 
diff --git a/pages/common/python.md b/pages/common/python.md
index 64516d8964..0351572ab0 100644
--- a/pages/common/python.md
+++ b/pages/common/python.md
@@ -25,7 +25,7 @@
 
 - Install a package using `pip`:
 
-`python -m {{pip}} install {{package_name}}`
+`python -m pip install {{package}}`
 
 - Interactively debug a Python script:
 
diff --git a/pages/common/stack.md b/pages/common/stack.md
index 7e8fa0544b..6474d74274 100644
--- a/pages/common/stack.md
+++ b/pages/common/stack.md
@@ -5,7 +5,7 @@
 
 - Create a new package:
 
-`stack new {{package_name}} {{template_name}}`
+`stack new {{package}} {{template}}`
 
 - Compile a package:
 
@@ -25,4 +25,4 @@
 
 - Run a program and pass an argument to it:
 
-`stack exec {{program_name}} -- {{argument}}`
+`stack exec {{program}} -- {{argument}}`
diff --git a/pages/common/tlmgr-info.md b/pages/common/tlmgr-info.md
index a40db41d63..874b7a03bd 100644
--- a/pages/common/tlmgr-info.md
+++ b/pages/common/tlmgr-info.md
@@ -17,11 +17,11 @@
 
 - Show information about a specific package:
 
-`tlmgr info {{package_name}}`
+`tlmgr info {{package}}`
 
 - List all files contained in a specific package:
 
-`tlmgr info {{package_name}} --list`
+`tlmgr info {{package}} --list`
 
 - List all installed packages:
 
@@ -29,7 +29,7 @@
 
 - Show only specific information about a package:
 
-`tlmgr info {{package_name}} --data "{{name}},{{category}},{{installed}},{{size}},{{depends}},..."`
+`tlmgr info {{package}} --data "{{name}},{{category}},{{installed}},{{size}},{{depends}},..."`
 
 - Print all available packages as JSON encoded array:
 
diff --git a/pages/common/wapm.md b/pages/common/wapm.md
index 987e7d2332..86b8016891 100644
--- a/pages/common/wapm.md
+++ b/pages/common/wapm.md
@@ -11,17 +11,17 @@
 
 `wapm install`
 
-- Download a specific version of a package and add it to the list of dependencies in wapm.toml:
+- Download a specific version of a package and add it to the list of dependencies in `wapm.toml`:
 
-`wapm install {{package_name}}@{{version}}`
+`wapm install {{package}}@{{version}}`
 
 - Download a package and install it globally:
 
-`wapm install --global {{package_name}}`
+`wapm install --global {{package}}`
 
 - Uninstall a package and remove it from the list of dependencies in `wapm.toml`:
 
-`wapm uninstall {{package_name}}`
+`wapm uninstall {{package}}`
 
 - Print a tree of locally installed dependencies:
 
diff --git a/pages/common/yarn-why.md b/pages/common/yarn-why.md
index 2c005e37e8..0c42bd3213 100644
--- a/pages/common/yarn-why.md
+++ b/pages/common/yarn-why.md
@@ -5,4 +5,4 @@
 
 - Show why a Yarn package is installed:
 
-`yarn-why {{package_name}}`
+`yarn-why {{package}}`
diff --git a/pages/linux/apt-file.md b/pages/linux/apt-file.md
index 558293f683..f8d23267e9 100644
--- a/pages/linux/apt-file.md
+++ b/pages/linux/apt-file.md
@@ -13,7 +13,7 @@
 
 - List the contents of a specific package:
 
-`apt-file {{show|list}} {{package_name}}`
+`apt-file {{show|list}} {{package}}`
 
 - Search for packages that match the `regular_expression`:
 
diff --git a/pages/linux/apt-mark.md b/pages/linux/apt-mark.md
index a7198665fd..34f6196415 100644
--- a/pages/linux/apt-mark.md
+++ b/pages/linux/apt-mark.md
@@ -5,15 +5,15 @@
 
 - Mark a package as automatically installed:
 
-`sudo apt-mark auto {{package_name}}`
+`sudo apt-mark auto {{package}}`
 
 - Hold a package at its current version and prevent updates to it:
 
-`sudo apt-mark hold {{package_name}}`
+`sudo apt-mark hold {{package}}`
 
 - Allow a package to be updated again:
 
-`sudo apt-mark unhold {{package_name}}`
+`sudo apt-mark unhold {{package}}`
 
 - Show manually installed packages:
 
diff --git a/pages/linux/aura.md b/pages/linux/aura.md
index 34ac65449c..1fe182935c 100644
--- a/pages/linux/aura.md
+++ b/pages/linux/aura.md
@@ -5,11 +5,11 @@
 
 - Search for packages from the official repositories and AUR:
 
-`aura --aursync --both --search {{package_name|search_regex}}`
+`aura --aursync --both --search {{keyword|regular_expression}}`
 
 - Install a package from the AUR:
 
-`aura --aursync {{package_name}}`
+`aura --aursync {{package}}`
 
 - Update all AUR packages in a verbose mode and remove all make dependencies:
 
@@ -17,7 +17,7 @@
 
 - Install a package from the official repositories:
 
-`aura --sync {{package_name}}`
+`aura --sync {{package}}`
 
 - Synchronize and update all packages from the official repositories:
 
@@ -25,11 +25,11 @@
 
 - Downgrade a package using the package cache:
 
-`aura --downgrade {{package_name}}`
+`aura --downgrade {{package}}`
 
 - Remove a package and its dependencies:
 
-`aura --remove --recursive --unneeded {{package_name}}`
+`aura --remove --recursive --unneeded {{package}}`
 
 - Remove orphan packages (installed as dependencies but not required by any package):
 
diff --git a/pages/linux/aurman.md b/pages/linux/aurman.md
index cf74a87000..6dc4ba48dc 100644
--- a/pages/linux/aurman.md
+++ b/pages/linux/aurman.md
@@ -14,15 +14,15 @@
 
 - Install a new package:
 
-`aurman --sync {{package_name}}`
+`aurman --sync {{package}}`
 
 - Install a new package without show changes of `PKGBUILD` files:
 
-`aurman --sync --noedit {{package_name}}`
+`aurman --sync --noedit {{package}}`
 
 - Install a new package without prompting:
 
-`aurman --sync --noedit --noconfirm {{package_name}}`
+`aurman --sync --noedit --noconfirm {{package}}`
 
 - Search the package database for a keyword from the official repositories and AUR:
 
@@ -30,7 +30,7 @@
 
 - Remove a package and its dependencies:
 
-`aurman --remove --recursive --nosave {{package_name}}`
+`aurman --remove --recursive --nosave {{package}}`
 
 - Clear the package cache (use two `--clean` flags to clean all packages):
 
diff --git a/pages/linux/cpulimit.md b/pages/linux/cpulimit.md
index 492f83fdfb..1f1e883f8c 100644
--- a/pages/linux/cpulimit.md
+++ b/pages/linux/cpulimit.md
@@ -13,7 +13,7 @@
 
 - Launch a given program and limit it to only use 50% of the CPU:
 
-`cpulimit --limit {{50}} -- {{program arg1 arg2 ...}}`
+`cpulimit --limit {{50}} -- {{program argument1 argument2 ...}}`
 
 - Launch a program, limit its CPU usage to 50% and run cpulimit in the background:
 
diff --git a/pages/linux/debman.md b/pages/linux/debman.md
index 44b004e027..3d93792a02 100644
--- a/pages/linux/debman.md
+++ b/pages/linux/debman.md
@@ -3,14 +3,14 @@
 > Read man pages from uninstalled packages.
 > More information: <https://manpages.debian.org/latest/debian-goodies/debman.1.html>.
 
-- Read a man page for a command that is provided by a specified package name:
+- Read a man page for a command that is provided by a specified package:
 
-`debman -p {{package_name}} {{command_name}}`
+`debman -p {{package}} {{command}}`
 
 - Specify a package version to download:
 
-`debman -p {{package_name}}={{version}} {{command_name}}`
+`debman -p {{package}}={{version}} {{command}}`
 
 - Read a man page in a `.deb` file:
 
-`debman -f {{path/to/filename.deb}} {{command_name}}`
+`debman -f {{path/to/filename.deb}} {{command}}`
diff --git a/pages/linux/dget.md b/pages/linux/dget.md
index 8b9582eb97..a8adf4ab5e 100644
--- a/pages/linux/dget.md
+++ b/pages/linux/dget.md
@@ -5,7 +5,7 @@
 
 - Download a binary package:
 
-`dget {{package_name}}`
+`dget {{package}}`
 
 - Download and extract a package source from its `.dsc` file:
 
diff --git a/pages/linux/distrobox-export.md b/pages/linux/distrobox-export.md
index 35fb8eb4de..cd8c8ae994 100644
--- a/pages/linux/distrobox-export.md
+++ b/pages/linux/distrobox-export.md
@@ -6,7 +6,7 @@
 
 - Export an app from the container to the host (the desktop entry/icon will show up in your host system's application list):
 
-`distrobox-export --app {{package_name}} --extra-flags "--foreground"`
+`distrobox-export --app {{package}} --extra-flags "--foreground"`
 
 - Export a binary from the container to the host:
 
diff --git a/pages/linux/dpkg.md b/pages/linux/dpkg.md
index 4e80a4ea93..6008361126 100644
--- a/pages/linux/dpkg.md
+++ b/pages/linux/dpkg.md
@@ -11,7 +11,7 @@
 
 - Remove a package:
 
-`dpkg -r {{package_name}}`
+`dpkg -r {{package}}`
 
 - List installed packages:
 
@@ -19,7 +19,7 @@
 
 - List a package's contents:
 
-`dpkg -L {{package_name}}`
+`dpkg -L {{package}}`
 
 - List contents of a local package file:
 
@@ -27,4 +27,4 @@
 
 - Find out which package owns a file:
 
-`dpkg -S {{filename}}`
+`dpkg -S {{path/to/file}}`
diff --git a/pages/linux/eix.md b/pages/linux/eix.md
index 71957d8688..8991e49d5e 100644
--- a/pages/linux/eix.md
+++ b/pages/linux/eix.md
@@ -6,11 +6,11 @@
 
 - Search for a package:
 
-`eix {{package_name}}`
+`eix {{query}}`
 
 - Search for installed packages:
 
-`eix --installed {{package_name}}`
+`eix --installed {{query}}`
 
 - Search in package descriptions:
 
diff --git a/pages/linux/emerge.md b/pages/linux/emerge.md
index 87ff76ad8e..55a15bc57a 100644
--- a/pages/linux/emerge.md
+++ b/pages/linux/emerge.md
@@ -18,11 +18,11 @@
 
 - Install a new package, with confirmation:
 
-`emerge -av {{package_name}}`
+`emerge -av {{package}}`
 
 - Remove a package, with confirmation:
 
-`emerge -Cav {{package_name}}`
+`emerge -Cav {{package}}`
 
 - Remove orphaned packages (that were installed only as dependencies):
 
diff --git a/pages/linux/eopkg.md b/pages/linux/eopkg.md
index e7f0352f5d..b94037ef08 100644
--- a/pages/linux/eopkg.md
+++ b/pages/linux/eopkg.md
@@ -5,7 +5,7 @@
 
 - Install a specific package:
 
-`sudo eopkg install {{package_name}}`
+`sudo eopkg install {{package}}`
 
 - Update all packages:
 
diff --git a/pages/linux/equery.md b/pages/linux/equery.md
index 3641bfd4a5..18bdcffbb3 100644
--- a/pages/linux/equery.md
+++ b/pages/linux/equery.md
@@ -9,16 +9,16 @@
 
 - Search for installed packages in the Portage tree and in overlays:
 
-`equery list -po {{package_name}}`
+`equery list -po {{package1 package2 ...}}`
 
 - List all packages that depend on a given package:
 
-`equery depends {{package_name}}`
+`equery depends {{package}}`
 
 - List all packages that a given package depends on:
 
-`equery depgraph {{package_name}}`
+`equery depgraph {{package}}`
 
 - List all files installed by a package:
 
-`equery files --tree {{package_name}}`
+`equery files --tree {{package}}`
diff --git a/pages/linux/fixfiles.md b/pages/linux/fixfiles.md
index 345d1d608b..f4dd0ab13d 100644
--- a/pages/linux/fixfiles.md
+++ b/pages/linux/fixfiles.md
@@ -17,7 +17,7 @@
 
 - Use the [R]pm database to discover all files within specific packages and restore the file contexts:
 
-`fixfiles -R {{rpm_package_name1,rpm_package_name2 ...}}`
+`fixfiles -R {{rpm_package1,rpm_package2 ...}}`
 
 - Run a diff on the `PREVIOUS_FILECONTEXT` file to the [C]urrently installed one, and restore the context of all affected files:
 
diff --git a/pages/linux/gnome-software.md b/pages/linux/gnome-software.md
index b5cc8e10d9..072639c903 100644
--- a/pages/linux/gnome-software.md
+++ b/pages/linux/gnome-software.md
@@ -11,9 +11,9 @@
 
 `gnome-software --mode {{updates|updated|installed|overview}}`
 
-- Launch the GNOME Software GUI if it's not open, and view the specified package:
+- Launch the GNOME Software GUI if it's not open and view the details of the specified package:
 
-`gnome-software --details {{package_name}}`
+`gnome-software --details {{package}}`
 
 - Display the version:
 
diff --git a/pages/linux/guix-package.md b/pages/linux/guix-package.md
index 07b6881715..20eeba0147 100644
--- a/pages/linux/guix-package.md
+++ b/pages/linux/guix-package.md
@@ -5,11 +5,11 @@
 
 - Install a new package:
 
-`guix package -i {{package_name}}`
+`guix package -i {{package}}`
 
 - Remove a package:
 
-`guix package -r {{package_name}}`
+`guix package -r {{package}}`
 
 - Search the package database for a regular expression:
 
diff --git a/pages/linux/pacaur.md b/pages/linux/pacaur.md
index 72457c56e4..e8a366a172 100644
--- a/pages/linux/pacaur.md
+++ b/pages/linux/pacaur.md
@@ -13,11 +13,11 @@
 
 - Install a new package (includes AUR):
 
-`pacaur -S {{package_name}}`
+`pacaur -S {{package}}`
 
 - Remove a package and its dependencies (includes AUR packages):
 
-`pacaur -Rs {{package_name}}`
+`pacaur -Rs {{package}}`
 
 - Search the package database for a keyword (includes AUR):
 
diff --git a/pages/linux/pacman-database.md b/pages/linux/pacman-database.md
index b6afd34680..79e61c841d 100644
--- a/pages/linux/pacman-database.md
+++ b/pages/linux/pacman-database.md
@@ -7,11 +7,11 @@
 
 - Mark a package as implicitly installed:
 
-`sudo pacman --database --asdeps {{package_name}}`
+`sudo pacman --database --asdeps {{package}}`
 
 - Mark a package as explicitly installed:
 
-`sudo pacman --database --asexplicit {{package_name}}`
+`sudo pacman --database --asexplicit {{package}}`
 
 - Check that all the package dependencies are installed:
 
diff --git a/pages/linux/pacman-deptest.md b/pages/linux/pacman-deptest.md
index 4a76dd5166..4c83c67524 100644
--- a/pages/linux/pacman-deptest.md
+++ b/pages/linux/pacman-deptest.md
@@ -6,7 +6,7 @@
 
 - Print the package names of the dependencies that aren't installed:
 
-`pacman --deptest {{package_name1}} {{package_name2}}`
+`pacman --deptest {{package1 package2 ...}}`
 
 - Check if the installed package satisfies the given minimum version:
 
diff --git a/pages/linux/pacman-files.md b/pages/linux/pacman-files.md
index e900f50e6c..4a50804873 100644
--- a/pages/linux/pacman-files.md
+++ b/pages/linux/pacman-files.md
@@ -22,7 +22,7 @@
 
 - List the files owned by a specific package:
 
-`pacman --files --list {{package_name}}`
+`pacman --files --list {{package}}`
 
 - Display help:
 
diff --git a/pages/linux/pacman-query.md b/pages/linux/pacman-query.md
index aee6e6ece0..084ec9989a 100644
--- a/pages/linux/pacman-query.md
+++ b/pages/linux/pacman-query.md
@@ -18,11 +18,11 @@
 
 - Display information about an installed package:
 
-`pacman --query --info {{package_name}}`
+`pacman --query --info {{package}}`
 
 - List files owned by a package:
 
-`pacman --query --list {{package_name}}`
+`pacman --query --list {{package}}`
 
 - List orphan packages (installed as dependencies but not required by any package):
 
diff --git a/pages/linux/pacman-remove.md b/pages/linux/pacman-remove.md
index dda7da2ac1..83f21d0a07 100644
--- a/pages/linux/pacman-remove.md
+++ b/pages/linux/pacman-remove.md
@@ -6,15 +6,15 @@
 
 - Remove a package and its dependencies:
 
-`sudo pacman --remove --recursive {{package_name}}`
+`sudo pacman --remove --recursive {{package}}`
 
 - Remove a package and both its dependencies and configuration files:
 
-`sudo pacman --remove --recursive --nosave {{package_name}}`
+`sudo pacman --remove --recursive --nosave {{package}}`
 
 - Remove a package without prompting:
 
-`sudo pacman --remove --noconfirm {{package_name}}`
+`sudo pacman --remove --noconfirm {{package}}`
 
 - Remove orphan packages (installed as dependencies but not required by any package):
 
@@ -22,11 +22,11 @@
 
 - Remove a package and all packages that depend on it:
 
-`sudo pacman --remove --cascade {{package_name}}`
+`sudo pacman --remove --cascade {{package}}`
 
 - List packages that would be affected (does not remove any packages):
 
-`pacman --remove --print {{package_name}}`
+`pacman --remove --print {{package}}`
 
 - Display help for this subcommand:
 
diff --git a/pages/linux/pacman-sync.md b/pages/linux/pacman-sync.md
index 7eda2459bf..7c8c6e952a 100644
--- a/pages/linux/pacman-sync.md
+++ b/pages/linux/pacman-sync.md
@@ -6,7 +6,7 @@
 
 - Install a new package:
 
-`sudo pacman --sync {{package_name}}`
+`sudo pacman --sync {{package}}`
 
 - Synchronize and update all packages (add `--downloadonly` to download the packages and not update them):
 
@@ -14,7 +14,7 @@
 
 - Update all packages and install a new one without prompting:
 
-`sudo pacman --sync --refresh --sysupgrade --noconfirm {{package_name}}`
+`sudo pacman --sync --refresh --sysupgrade --noconfirm {{package}}`
 
 - Search the package database for a regular expression or keyword:
 
@@ -22,7 +22,7 @@
 
 - Display information about a package:
 
-`pacman --sync --info {{package_name}}`
+`pacman --sync --info {{package}}`
 
 - Overwrite conflicting files during a package update:
 
@@ -30,7 +30,7 @@
 
 - Synchronize and update all packages, but ignore a specific package (can be used more than once):
 
-`sudo pacman --sync --refresh --sysupgrade --ignore {{package_name}}`
+`sudo pacman --sync --refresh --sysupgrade --ignore {{package}}`
 
 - Remove not installed packages and unused repositories from the cache (use two `--clean` flags to clean all packages):
 
diff --git a/pages/linux/pacman.md b/pages/linux/pacman.md
index 3b797ff5a2..1a203bde2c 100644
--- a/pages/linux/pacman.md
+++ b/pages/linux/pacman.md
@@ -11,11 +11,11 @@
 
 - Install a new package:
 
-`sudo pacman -S {{package_name}}`
+`sudo pacman -S {{package}}`
 
 - Remove a package and its dependencies:
 
-`sudo pacman -Rs {{package_name}}`
+`sudo pacman -Rs {{package}}`
 
 - Search the database for packages containing a specific file:
 
diff --git a/pages/linux/pacstall.md b/pages/linux/pacstall.md
index 5c4c9d6954..e9bb983371 100644
--- a/pages/linux/pacstall.md
+++ b/pages/linux/pacstall.md
@@ -5,15 +5,15 @@
 
 - Search the package database for a package name:
 
-`pacstall --search {{package_name}}`
+`pacstall --search {{query}}`
 
 - Install a package:
 
-`pacstall --install {{package_name}}`
+`pacstall --install {{package}}`
 
 - Remove a package:
 
-`pacstall --remove {{package_name}}`
+`pacstall --remove {{package}}`
 
 - Add a repository to the database (only GitHub and GitLab are supported):
 
@@ -29,7 +29,7 @@
 
 - Display information about a package:
 
-`pacstall --query-info {{package_name}}`
+`pacstall --query-info {{package}}`
 
 - List all installed packages:
 
diff --git a/pages/linux/paru.md b/pages/linux/paru.md
index 35f4a7e499..607e25d924 100644
--- a/pages/linux/paru.md
+++ b/pages/linux/paru.md
@@ -17,12 +17,12 @@
 
 - Get information about a package:
 
-`paru -Si {{package_name}}`
+`paru -Si {{package}}`
 
 - Download `PKGBUILD` and other package source files from the AUR or ABS:
 
-`paru --getpkgbuild {{package_name}}`
+`paru --getpkgbuild {{package}}`
 
 - Display the `PKGBUILD` file of a package:
 
-`paru --getpkgbuild --print {{package_name}}`
+`paru --getpkgbuild --print {{package}}`
diff --git a/pages/linux/pkgadd.md b/pages/linux/pkgadd.md
index e49e51ae59..3aff5b5f9c 100644
--- a/pages/linux/pkgadd.md
+++ b/pages/linux/pkgadd.md
@@ -5,8 +5,8 @@
 
 - Install a local software package:
 
-`pkgadd {{package_name}}`
+`pkgadd {{package}}`
 
 - Update an already installed package from a local package:
 
-`pkgadd -u {{package_name}}`
+`pkgadd -u {{package}}`
diff --git a/pages/linux/pkgfile.md b/pages/linux/pkgfile.md
index 42a2aecc4b..4c12deff16 100644
--- a/pages/linux/pkgfile.md
+++ b/pages/linux/pkgfile.md
@@ -14,11 +14,11 @@
 
 - List all files provided by a package:
 
-`pkgfile --list {{package_name}}`
+`pkgfile --list {{package}}`
 
-- List only files provided by a package located within the `bin` or `sbin` directory:
+- List executables provided by a package:
 
-`pkgfile --list --binaries {{package_name}}`
+`pkgfile --list --binaries {{package}}`
 
 - Search for a package that owns a specific file using case-insensitive matching:
 
diff --git a/pages/linux/pkginfo.md b/pages/linux/pkginfo.md
index 297384b018..df429a0673 100644
--- a/pages/linux/pkginfo.md
+++ b/pages/linux/pkginfo.md
@@ -9,7 +9,7 @@
 
 - List files owned by a package:
 
-`pkginfo -l {{package_name}}`
+`pkginfo -l {{package}}`
 
 - List the owner(s) of files matching a pattern:
 
diff --git a/pages/linux/pkgrm.md b/pages/linux/pkgrm.md
index fd4b665767..24852bbcc1 100644
--- a/pages/linux/pkgrm.md
+++ b/pages/linux/pkgrm.md
@@ -5,4 +5,4 @@
 
 - Remove an installed package:
 
-`pkgrm {{package_name}}`
+`pkgrm {{package}}`
diff --git a/pages/linux/prt-get.md b/pages/linux/prt-get.md
index 4a3ce5b9ca..879e0104ab 100644
--- a/pages/linux/prt-get.md
+++ b/pages/linux/prt-get.md
@@ -5,19 +5,19 @@
 
 - Install a package:
 
-`prt-get install {{package_name}}`
+`prt-get install {{package}}`
 
 - Install a package with dependency handling:
 
-`prt-get depinst {{package_name}}`
+`prt-get depinst {{package}}`
 
 - Update a package manually:
 
-`prt-get upgrade {{package_name}}`
+`prt-get upgrade {{package}}`
 
 - Remove a package:
 
-`prt-get remove {{package_name}}`
+`prt-get remove {{package}}`
 
 - Upgrade the system from the local ports tree:
 
@@ -25,7 +25,7 @@
 
 - Search the ports tree:
 
-`prt-get search {{package_name}}`
+`prt-get search {{query}}`
 
 - Search for a file in a package:
 
diff --git a/pages/linux/qm-guest-exec.md b/pages/linux/qm-guest-exec.md
index 5c683be691..89d1f7d609 100644
--- a/pages/linux/qm-guest-exec.md
+++ b/pages/linux/qm-guest-exec.md
@@ -5,16 +5,16 @@
 
 - Execute a specific command via a guest agent:
 
-`qm guest exec {{vm_id}} {{command}} {{arg1 arg2 ...}}`
+`qm guest exec {{vm_id}} {{command}} {{argument1 argument2 ...}}`
 
 - Execute a specific command via a guest agent asynchronously:
 
-`qm guest exec {{vm_id}} {{arg1 arg2 ...}} --synchronous 0`
+`qm guest exec {{vm_id}} {{argument1 argument2 ...}} --synchronous 0`
 
 - Execute a specific command via a guest agent with a specified timeout of 10 seconds:
 
-`qm guest exec {{vm_id}} {{arg1 arg2 ...}} --timeout {{10}}`
+`qm guest exec {{vm_id}} {{argument1 argument2...}} --timeout {{10}}`
 
 - Execute a specific command via a guest agent and forward input from STDIN until EOF to the guest agent:
 
-`qm guest exec {{vm_id}} {{arg1 arg2 ...}} --pass-stdin 1`
+`qm guest exec {{vm_id}} {{argument1 argument2 ...}} --pass-stdin 1`
diff --git a/pages/linux/rpm.md b/pages/linux/rpm.md
index be28e6f96f..7c2678cab1 100644
--- a/pages/linux/rpm.md
+++ b/pages/linux/rpm.md
@@ -14,7 +14,7 @@
 
 - Forcibly install a package regardless of currently installed versions:
 
-`rpm --upgrade {{package_name.rpm}} --force`
+`rpm --upgrade {{path/to/package.rpm}} --force`
 
 - Identify owner of a file and show version of the package:
 
@@ -26,7 +26,7 @@
 
 - Show scriptlets from an RPM file:
 
-`rpm --query --package --scripts {{package_name.rpm}}`
+`rpm --query --package --scripts {{package.rpm}}`
 
 - Show changed, missing and/or incorrectly installed files of matching packages:
 
@@ -34,4 +34,4 @@
 
 - Display the changelog of a specific package:
 
-`rpm --query --changelog {{package_name}}`
+`rpm --query --changelog {{package}}`
diff --git a/pages/linux/slapt-get.md b/pages/linux/slapt-get.md
index 2c8b68bcb3..6afccef601 100644
--- a/pages/linux/slapt-get.md
+++ b/pages/linux/slapt-get.md
@@ -10,11 +10,11 @@
 
 - Install a package, or update it to the latest available version:
 
-`slapt-get --install {{package_name}}`
+`slapt-get --install {{package}}`
 
 - Remove a package:
 
-`slapt-get --remove {{package_name}}`
+`slapt-get --remove {{package}}`
 
 - Upgrade all installed packages to their latest available versions:
 
@@ -22,8 +22,8 @@
 
 - Locate packages by the package name, disk set, or version:
 
-`slapt-get --search {{package_name}}`
+`slapt-get --search {{query}}`
 
 - Show information about a package:
 
-`slapt-get --show {{package_name}}`
+`slapt-get --show {{package}}`
diff --git a/pages/linux/snap.md b/pages/linux/snap.md
index c50d514e62..783f7f62f3 100644
--- a/pages/linux/snap.md
+++ b/pages/linux/snap.md
@@ -6,19 +6,19 @@
 
 - Search for a package:
 
-`snap find {{package_name}}`
+`snap find {{query}}`
 
 - Install a package:
 
-`snap install {{package_name}}`
+`snap install {{package}}`
 
 - Update a package:
 
-`snap refresh {{package_name}}`
+`snap refresh {{package}}`
 
 - Update a package to another channel (track, risk, or branch):
 
-`snap refresh {{package_name}} --channel={{channel}}`
+`snap refresh {{package}} --channel={{channel}}`
 
 - Update all packages:
 
@@ -30,7 +30,7 @@
 
 - Uninstall a package:
 
-`snap remove {{package_name}}`
+`snap remove {{package}}`
 
 - Check for recent snap changes in the system:
 
diff --git a/pages/linux/yaourt.md b/pages/linux/yaourt.md
index aac749aeb7..b63e9ea3bb 100644
--- a/pages/linux/yaourt.md
+++ b/pages/linux/yaourt.md
@@ -9,15 +9,15 @@
 
 - Install a new package (includes AUR):
 
-`yaourt -S {{package_name}}`
+`yaourt -S {{package}}`
 
 - Remove a package and its dependencies (includes AUR packages):
 
-`yaourt -Rs {{package_name}}`
+`yaourt -Rs {{package}}`
 
 - Search the package database for a keyword (including AUR):
 
-`yaourt -Ss {{package_name}}`
+`yaourt -Ss {{query}}`
 
 - List installed packages, versions, and repositories (AUR packages will be listed under the repository name 'local'):
 
diff --git a/pages/linux/yay.md b/pages/linux/yay.md
index 5d76594e74..501724e239 100644
--- a/pages/linux/yay.md
+++ b/pages/linux/yay.md
@@ -18,11 +18,11 @@
 
 - Install a new package from the repos and AUR:
 
-`yay -S {{package_name}}`
+`yay -S {{package}}`
 
 - Remove an installed package and both its dependencies and configuration files:
 
-`yay -Rns {{package_name}}`
+`yay -Rns {{package}}`
 
 - Search the package database for a keyword from the repos and AUR:
 
diff --git a/pages/osx/port.md b/pages/osx/port.md
index 0b5f2d281c..f417fa71b4 100644
--- a/pages/osx/port.md
+++ b/pages/osx/port.md
@@ -9,7 +9,7 @@
 
 - Install a package:
 
-`sudo port install {{package_name}}`
+`sudo port install {{package}}`
 
 - List installed packages:
 
diff --git a/pages/windows/choco-new.md b/pages/windows/choco-new.md
index cdb676a91f..1eb4f63b44 100644
--- a/pages/windows/choco-new.md
+++ b/pages/windows/choco-new.md
@@ -5,20 +5,20 @@
 
 - Create a new package skeleton:
 
-`choco new {{package_name}}`
+`choco new {{package}}`
 
 - Create a new package with a specific version:
 
-`choco new {{package_name}} --version {{version}}`
+`choco new {{package}} --version {{version}}`
 
 - Create a new package with a specific maintainer name:
 
-`choco new {{package_name}} --maintainer {{maintainer_name}}`
+`choco new {{package}} --maintainer {{maintainer_name}}`
 
 - Create a new package in a custom output directory:
 
-`choco new {{package_name}} --output-directory {{path/to/directory}}`
+`choco new {{package}} --output-directory {{path/to/directory}}`
 
 - Create a new package with specific 32-bit and 64-bit installer URLs:
 
-`choco new {{package_name}} url="{{url}}" url64="{{url}}"`
+`choco new {{package}} url="{{url}}" url64="{{url}}"`
diff --git a/pages/windows/octo.md b/pages/windows/octo.md
index ae4bb4afa0..daee05a953 100644
--- a/pages/windows/octo.md
+++ b/pages/windows/octo.md
@@ -5,11 +5,11 @@
 
 - Create a package:
 
-`octo pack --id={{package_name}}`
+`octo pack --id={{package}}`
 
 - Push a package to a repository on the Octopus server:
 
-`octo push --package={{package_name}}`
+`octo push --package={{package}}`
 
 - Create a release:
 
diff --git a/pages/windows/pipwin.md b/pages/windows/pipwin.md
index caf7c142de..9627294f3c 100644
--- a/pages/windows/pipwin.md
+++ b/pages/windows/pipwin.md
@@ -13,15 +13,15 @@
 
 - Install a package:
 
-`pipwin install {{package_name}}`
+`pipwin install {{package}}`
 
 - Uninstall a package:
 
-`pipwin uninstall {{package_name}}`
+`pipwin uninstall {{package}}`
 
 - Download a package to a specific directory:
 
-`pipwin download --dest {{path\to\directory}} {{package_name}}`
+`pipwin download --dest {{path\to\directory}} {{package}}`
 
 - Install packages according to `requirements.txt`: