diff --git a/pages/common/calibredb.md b/pages/common/calibredb.md
index 2e0a3bdb4..8d12b9ae6 100644
--- a/pages/common/calibredb.md
+++ b/pages/common/calibredb.md
@@ -9,11 +9,11 @@
 
 - Search for ebooks displaying additional information:
 
-`calibredb list --search {{search-term}}`
+`calibredb list --search {{search_term}}`
 
 - Search for just ids of ebooks:
 
-`calibredb search {{search term}}`
+`calibredb search {{search_term}}`
 
 - Add one or more ebooks to the library:
 
diff --git a/pages/common/git-checkout.md b/pages/common/git-checkout.md
index 4af64e2f2..52a6723d3 100644
--- a/pages/common/git-checkout.md
+++ b/pages/common/git-checkout.md
@@ -4,11 +4,11 @@
 
 - Switch to another branch:
 
-`git checkout {{BRANCH-NAME}}`
+`git checkout {{branch_name}}`
 
 - Create and switch to a new branch:
 
-`git checkout -b {{BRANCH-NAME}}`
+`git checkout -b {{branch_name}}`
 
 - Undo unstaged local modification:
 
diff --git a/pages/common/git-clone.md b/pages/common/git-clone.md
index 3d24b1f70..1a235fa1b 100644
--- a/pages/common/git-clone.md
+++ b/pages/common/git-clone.md
@@ -4,7 +4,7 @@
 
 - Clone an existing repository:
 
-`git clone {{REMOTE-REPOSITORY-LOCATION}}`
+`git clone {{remote_repository_location}}`
 
 - For cloning from the local machine:
 
@@ -16,4 +16,4 @@
 
 - Clone an existing repository, and truncate to the specified number of revisions, save your time mostly:
 
-`git clone --depth 10 {{REMOTE-REPOSITORY-LOCATION}}`
+`git clone --depth 10 {{remote_repository_location}}`
diff --git a/pages/common/git-commit.md b/pages/common/git-commit.md
index b76a1c9c3..e84a76611 100644
--- a/pages/common/git-commit.md
+++ b/pages/common/git-commit.md
@@ -4,7 +4,7 @@
 
 - Commit staged files to the repository with comment:
 
-`git commit -m {{MESSAGE}}`
+`git commit -m {{message}}`
 
 - Replace the last commit with currently staged changes:
 
diff --git a/pages/common/git-merge.md b/pages/common/git-merge.md
index ab13e7c1f..7dbf79537 100644
--- a/pages/common/git-merge.md
+++ b/pages/common/git-merge.md
@@ -4,8 +4,8 @@
 
 - Merge a branch with your current branch:
 
-`git merge {{BRANCH-NAME}}`
+`git merge {{branch_name}}`
 
 - Edit the merge message:
 
-`git merge -e {{BRANCH-NAME}}`
+`git merge -e {{branch_name}}`
diff --git a/pages/common/git-push.md b/pages/common/git-push.md
index 40e939308..0381b875f 100644
--- a/pages/common/git-push.md
+++ b/pages/common/git-push.md
@@ -4,19 +4,19 @@
 
 - Publish local changes on a remote branch:
 
-`git push {{REMOTE-NAME}} {{LOCAL-BRANCH}}`
+`git push {{remote_name}} {{local_branch}}`
 
 - Publish local changes on a remote branch of different name:
 
-`git push {{REMOTE-NAME}} {{LOCAL-BRANCH}}:{{REMOTE-BRANCH}}`
+`git push {{remote_name}} {{local_branch}}:{{remote_branch}}`
 
 - Remove remote branch:
 
-`git push {{REMOTE-NAME}} :{{REMOTE-BRANCH}}`
+`git push {{remote_name}} :{{remote_branch}}`
 
 - Remove remote branches which don't exist locally:
 
-`git push --prune {{REMOTE-NAME}}`
+`git push --prune {{remote_name}}`
 
 - Publish tags:
 
diff --git a/pages/common/git-submodule.md b/pages/common/git-submodule.md
index 28607c453..0f7dbe150 100644
--- a/pages/common/git-submodule.md
+++ b/pages/common/git-submodule.md
@@ -8,7 +8,7 @@
 
 - Add a git repository as a submodule:
 
-`git submodule add {{repository-url}}`
+`git submodule add {{repository_url}}`
 
 - Update every submodule to its latest commit:
 
diff --git a/pages/common/git.md b/pages/common/git.md
index 7944c4d9b..67ac1fb63 100644
--- a/pages/common/git.md
+++ b/pages/common/git.md
@@ -12,8 +12,8 @@
 
 - Call help on a command:
 
-`git help {{COMMAND}}`
+`git help {{command}}`
 
 - Execute Git command:
 
-`git {{COMMAND}}`
+`git {{command}}`
diff --git a/pages/common/mp4box.md b/pages/common/mp4box.md
index 210d43ae7..7bd9e45f3 100644
--- a/pages/common/mp4box.md
+++ b/pages/common/mp4box.md
@@ -8,7 +8,7 @@
 
 - Add an SRT subtitle file into an MP4 file:
 
-`MP4Box -add {{input-subs.srt}}:lang=eng -add {{input.mp4}} {{output.mp4}}`
+`MP4Box -add {{input_subs.srt}}:lang=eng -add {{input.mp4}} {{output.mp4}}`
 
 - Combine audio from one file and video from another:
 
diff --git a/pages/common/qemu.md b/pages/common/qemu.md
index ca3af54e4..3d1ce3088 100644
--- a/pages/common/qemu.md
+++ b/pages/common/qemu.md
@@ -13,7 +13,7 @@
 
 - Boot QEMU instance with a live ISO image:
 
-`qemu-system-i386 -hda {{image_name.img}} -cdrom {{os-image.iso}} -boot d`
+`qemu-system-i386 -hda {{image_name.img}} -cdrom {{os_image.iso}} -boot d`
 
 - Specify amount of RAM for instance: