Updating internal variables from lh to lb scheme, should be the last piece to finish the live-helper to live-build rename.

34 files changed, 116 insertions, 116 deletions

diff --git a/templates/cgi/debian-official/build.html b/templates/cgi/debian-official/build.html
index 866938f..3fbb138 100644
--- a/templates/cgi/debian-official/build.html
+++ b/templates/cgi/debian-official/build.html
@@ -12,57 +12,57 @@
 
 <table>
 	<tr><td>Email: </td><td>EMAIL</td></tr>
-	<tr><td>--binary-image: </td><td>LH_BINARY_IMAGES</td></tr>
-	<tr><td>--distribution: </td><td>LH_DISTRIBUTION</td></tr>
-	<tr><td>--packages-lists: </td><td>LH_PACKAGES_LISTS</td></tr>
-	<tr><td>--tasks: </td><td>LH_TASKS</td><tr>
-	<tr><td>--packages: </td><td>LH_PACKAGES</td><tr>
+	<tr><td>--binary-image: </td><td>LB_BINARY_IMAGES</td></tr>
+	<tr><td>--distribution: </td><td>LB_DISTRIBUTION</td></tr>
+	<tr><td>--packages-lists: </td><td>LB_PACKAGES_LISTS</td></tr>
+	<tr><td>--tasks: </td><td>LB_TASKS</td><tr>
+	<tr><td>--packages: </td><td>LB_PACKAGES</td><tr>
 </table>
 
 <b>Advanced bootstrap options</b>
 
 <table>
-	<tr><td>--architecture: </td><td>LH_ARCHITECTURE</td></tr>
-	<tr><td>--bootstrap-flavour: </td><td>LH_BOOTSTRAP_FLAVOUR</td></tr>
-	<tr><td>--mirror-bootstrap: </td><td>LH_MIRROR_BOOTSTRAP</td></tr>
-	<tr><td>--mirror-binary: </td><td>LH_MIRROR_BINARY</td></tr>
-	<tr><td>--mirror-binary-security: </td><td>LH_MIRROR_BINARY_SECURITY</td></tr>
-	<tr><td>--archive-areas: </td><td>LH_ARCHIVE_AREAS</td></tr>
+	<tr><td>--architecture: </td><td>LB_ARCHITECTURE</td></tr>
+	<tr><td>--bootstrap-flavour: </td><td>LB_BOOTSTRAP_FLAVOUR</td></tr>
+	<tr><td>--mirror-bootstrap: </td><td>LB_MIRROR_BOOTSTRAP</td></tr>
+	<tr><td>--mirror-binary: </td><td>LB_MIRROR_BINARY</td></tr>
+	<tr><td>--mirror-binary-security: </td><td>LB_MIRROR_BINARY_SECURITY</td></tr>
+	<tr><td>--archive-areas: </td><td>LB_ARCHIVE_AREAS</td></tr>
 </table>
 
 <b>Advanced chroot options</b>
 
 <table>
-	<tr><td>--chroot-fileystem: </td><td>LH_CHROOT_FILESYSTEM</td></tr>
-	<tr><td>--linux-flavours: </td><td>LH_LINUX_FLAVOURS</td></tr>
-	<tr><td>--security: </td><td>LH_SECURITY</td></tr>
-	<tr><td>--symlinks: </td><td>LH_SYMLINKS</td></tr>
-	<tr><td>--sysvinit: </td><td>LH_SYSVINIT</td></tr>
+	<tr><td>--chroot-fileystem: </td><td>LB_CHROOT_FILESYSTEM</td></tr>
+	<tr><td>--linux-flavours: </td><td>LB_LINUX_FLAVOURS</td></tr>
+	<tr><td>--security: </td><td>LB_SECURITY</td></tr>
+	<tr><td>--symlinks: </td><td>LB_SYMLINKS</td></tr>
+	<tr><td>--sysvinit: </td><td>LB_SYSVINIT</td></tr>
 </table>
 
 <b>Advanced binary options</b>
 
 <table>
-	<tr><td>--binary-indices: </td><td>LH_BINARY_INDICES</td></tr>
-	<tr><td>--bootappend-live: </td><td>LH_BOOTAPPEND_LIVE</td></tr>
-	<tr><td>--bootloader: </td><td>LH_BOOTLOADER</td></tr>
-	<tr><td>--debian-installer: </td><td>LH_DEBIAN_INSTALLER</td></tr>
-	<tr><td>--bootappend-install: </td><td>LH_BOOTAPPEND_INSTALL</td></tr>
-	<tr><td>--encryption: </td><td>LH_ENCRYPTION</td></tr>
-	<tr><td>--iso-application: </td><td>LH_ISO_APPLICATION</td></tr>
-	<tr><td>--iso-preparer: </td><td>LH_ISO_PREPARER</td></tr>
-	<tr><td>--iso-publisher: </td><td>LH_ISO_PUBLISHER</td></tr>
-	<tr><td>--iso-volume: </td><td>LH_ISO_VOLUME</td></tr>
-	<tr><td>--memtest: </td><td>LH_MEMTEST</td></tr>
-	<tr><td>--net-path: </td><td>LH_NET_ROOT_PATH</td></tr>
-	<tr><td>--net-server: </td><td>LH_NET_ROOT_SERVER</td></tr>
+	<tr><td>--binary-indices: </td><td>LB_BINARY_INDICES</td></tr>
+	<tr><td>--bootappend-live: </td><td>LB_BOOTAPPEND_LIVE</td></tr>
+	<tr><td>--bootloader: </td><td>LB_BOOTLOADER</td></tr>
+	<tr><td>--debian-installer: </td><td>LB_DEBIAN_INSTALLER</td></tr>
+	<tr><td>--bootappend-install: </td><td>LB_BOOTAPPEND_INSTALL</td></tr>
+	<tr><td>--encryption: </td><td>LB_ENCRYPTION</td></tr>
+	<tr><td>--iso-application: </td><td>LB_ISO_APPLICATION</td></tr>
+	<tr><td>--iso-preparer: </td><td>LB_ISO_PREPARER</td></tr>
+	<tr><td>--iso-publisher: </td><td>LB_ISO_PUBLISHER</td></tr>
+	<tr><td>--iso-volume: </td><td>LB_ISO_VOLUME</td></tr>
+	<tr><td>--memtest: </td><td>LB_MEMTEST</td></tr>
+	<tr><td>--net-path: </td><td>LB_NET_ROOT_PATH</td></tr>
+	<tr><td>--net-server: </td><td>LB_NET_ROOT_SERVER</td></tr>
 </table>
 
 <b>Advanced source options</b>
 
 <table>
-	<tr><td>--source: </td><td>LH_SOURCE</td></tr>
-	<tr><td>--source-images: </td><td>LH_SOURCE_IMAGES</td></tr>
+	<tr><td>--source: </td><td>LB_SOURCE</td></tr>
+	<tr><td>--source-images: </td><td>LB_SOURCE_IMAGES</td></tr>
 </table>
 
 </fieldset>
diff --git a/templates/cgi/debian-official/form.html b/templates/cgi/debian-official/form.html
index fca9d2d..4c8018d 100644
--- a/templates/cgi/debian-official/form.html
+++ b/templates/cgi/debian-official/form.html
@@ -113,15 +113,15 @@
 		</tr>
 		<tr>
 			<td><label for="Mirror_Bootstrap">--mirror-bootstrap:</label> </td>
-			<td><input id="Mirror_Bootstrap" name="mirror_bootstrap" maxlength="256" size="50" type="text" value="LH_MIRROR_BOOTSTRAP" readonly /></td>
+			<td><input id="Mirror_Bootstrap" name="mirror_bootstrap" maxlength="256" size="50" type="text" value="LB_MIRROR_BOOTSTRAP" readonly /></td>
 		</tr>
 		<tr>
 			<td><label for="Mirror_Binary">--mirror-binary:</label> </td>
-			<td><input id="Mirror_Binary" name="mirror_binary" maxlength="256" size="50" type="text" value="LH_MIRROR_BINARY" /></td>
+			<td><input id="Mirror_Binary" name="mirror_binary" maxlength="256" size="50" type="text" value="LB_MIRROR_BINARY" /></td>
 		</tr>
 		<tr>
 			<td><label for="Mirror_Binary_Security">--mirror-binary-security:</label> </td>
-			<td><input id="Mirror_Binary_Security" name="mirror_binary_security" maxlength="256" size="50" type="text" value="LH_MIRROR_BINARY_SECURITY" readonly /></td>
+			<td><input id="Mirror_Binary_Security" name="mirror_binary_security" maxlength="256" size="50" type="text" value="LB_MIRROR_BINARY_SECURITY" readonly /></td>
 		</tr>
 		<tr>
 			<td><label for="Archive_Areas">--archive-areas:</label> </td>
diff --git a/templates/cgi/debian-unofficial/build.html b/templates/cgi/debian-unofficial/build.html
index 45b8d19..de2c9f5 100644
--- a/templates/cgi/debian-unofficial/build.html
+++ b/templates/cgi/debian-unofficial/build.html
@@ -12,57 +12,57 @@
 
 <table>
 	<tr><td>Email: </td><td>EMAIL</td></tr>
-	<tr><td>--binary-image: </td><td>LH_BINARY_IMAGES</td></tr>
-	<tr><td>--distribution: </td><td>LH_DISTRIBUTION</td></tr>
-	<tr><td>--packages-lists: </td><td>LH_PACKAGES_LISTS</td></tr>
-	<tr><td>--tasks: </td><td>LH_TASKS</td><tr>
-	<tr><td>--packages: </td><td>LH_PACKAGES</td><tr>
+	<tr><td>--binary-image: </td><td>LB_BINARY_IMAGES</td></tr>
+	<tr><td>--distribution: </td><td>LB_DISTRIBUTION</td></tr>
+	<tr><td>--packages-lists: </td><td>LB_PACKAGES_LISTS</td></tr>
+	<tr><td>--tasks: </td><td>LB_TASKS</td><tr>
+	<tr><td>--packages: </td><td>LB_PACKAGES</td><tr>
 </table>
 
 <b>Advanced bootstrap options</b>
 
 <table>
-	<tr><td>--architecture: </td><td>LH_ARCHITECTURE</td></tr>
-	<tr><td>--bootstrap-flavour: </td><td>LH_BOOTSTRAP_FLAVOUR</td></tr>
-	<tr><td>--mirror-bootstrap: </td><td>LH_MIRROR_BOOTSTRAP</td></tr>
-	<tr><td>--mirror-binary: </td><td>LH_MIRROR_BINARY</td></tr>
-	<tr><td>--mirror-binary-security: </td><td>LH_MIRROR_BINARY_SECURITY</td></tr>
-	<tr><td>--archive-areas: </td><td>LH_ARCHIVE_AREAS</td></tr>
+	<tr><td>--architecture: </td><td>LB_ARCHITECTURE</td></tr>
+	<tr><td>--bootstrap-flavour: </td><td>LB_BOOTSTRAP_FLAVOUR</td></tr>
+	<tr><td>--mirror-bootstrap: </td><td>LB_MIRROR_BOOTSTRAP</td></tr>
+	<tr><td>--mirror-binary: </td><td>LB_MIRROR_BINARY</td></tr>
+	<tr><td>--mirror-binary-security: </td><td>LB_MIRROR_BINARY_SECURITY</td></tr>
+	<tr><td>--archive-areas: </td><td>LB_ARCHIVE_AREAS</td></tr>
 </table>
 
 <b>Advanced chroot options</b>
 
 <table>
-	<tr><td>--chroot-fileystem: </td><td>LH_CHROOT_FILESYSTEM</td></tr>
-	<tr><td>--linux-flavours: </td><td>LH_LINUX_FLAVOURS</td></tr>
-	<tr><td>--security: </td><td>LH_SECURITY</td></tr>
-	<tr><td>--symlinks: </td><td>LH_SYMLINKS</td></tr>
-	<tr><td>--sysvinit: </td><td>LH_SYSVINIT</td></tr>
+	<tr><td>--chroot-fileystem: </td><td>LB_CHROOT_FILESYSTEM</td></tr>
+	<tr><td>--linux-flavours: </td><td>LB_LINUX_FLAVOURS</td></tr>
+	<tr><td>--security: </td><td>LB_SECURITY</td></tr>
+	<tr><td>--symlinks: </td><td>LB_SYMLINKS</td></tr>
+	<tr><td>--sysvinit: </td><td>LB_SYSVINIT</td></tr>
 </table>
 
 <b>Advanced binary options</b>
 
 <table>
-	<tr><td>--binary-indices: </td><td>LH_BINARY_INDICES</td></tr>
-	<tr><td>--bootappend-live: </td><td>LH_BOOTAPPEND_LIVE</td></tr>
-	<tr><td>--bootloader: </td><td>LH_BOOTLOADER</td></tr>
-	<tr><td>--debian-installer: </td><td>LH_DEBIAN_INSTALLER</td></tr>
-	<tr><td>--bootappend-install: </td><td>LH_BOOTAPPEND_INSTALL</td></tr>
-	<tr><td>--encryption: </td><td>LH_ENCRYPTION</td></tr>
-	<tr><td>--iso-application: </td><td>LH_ISO_APPLICATION</td></tr>
-	<tr><td>--iso-preparer: </td><td>LH_ISO_PREPARER</td></tr>
-	<tr><td>--iso-publisher: </td><td>LH_ISO_PUBLISHER</td></tr>
-	<tr><td>--iso-volume: </td><td>LH_ISO_VOLUME</td></tr>
-	<tr><td>--memtest: </td><td>LH_MEMTEST</td></tr>
-	<tr><td>--net-path: </td><td>LH_NET_ROOT_PATH</td></tr>
-	<tr><td>--net-server: </td><td>LH_NET_ROOT_SERVER</td></tr>
+	<tr><td>--binary-indices: </td><td>LB_BINARY_INDICES</td></tr>
+	<tr><td>--bootappend-live: </td><td>LB_BOOTAPPEND_LIVE</td></tr>
+	<tr><td>--bootloader: </td><td>LB_BOOTLOADER</td></tr>
+	<tr><td>--debian-installer: </td><td>LB_DEBIAN_INSTALLER</td></tr>
+	<tr><td>--bootappend-install: </td><td>LB_BOOTAPPEND_INSTALL</td></tr>
+	<tr><td>--encryption: </td><td>LB_ENCRYPTION</td></tr>
+	<tr><td>--iso-application: </td><td>LB_ISO_APPLICATION</td></tr>
+	<tr><td>--iso-preparer: </td><td>LB_ISO_PREPARER</td></tr>
+	<tr><td>--iso-publisher: </td><td>LB_ISO_PUBLISHER</td></tr>
+	<tr><td>--iso-volume: </td><td>LB_ISO_VOLUME</td></tr>
+	<tr><td>--memtest: </td><td>LB_MEMTEST</td></tr>
+	<tr><td>--net-path: </td><td>LB_NET_ROOT_PATH</td></tr>
+	<tr><td>--net-server: </td><td>LB_NET_ROOT_SERVER</td></tr>
 </table>
 
 <b>Advanced source options</b>
 
 <table>
-	<tr><td>--source: </td><td>LH_SOURCE</td></tr>
-	<tr><td>--source-images: </td><td>LH_SOURCE_IMAGES</td></tr>
+	<tr><td>--source: </td><td>LB_SOURCE</td></tr>
+	<tr><td>--source-images: </td><td>LB_SOURCE_IMAGES</td></tr>
 </table>
 
 <b>Unofficial options</b>
diff --git a/templates/cgi/debian-unofficial/form.html b/templates/cgi/debian-unofficial/form.html
index df11f67..acb3ccf 100644
--- a/templates/cgi/debian-unofficial/form.html
+++ b/templates/cgi/debian-unofficial/form.html
@@ -112,15 +112,15 @@
 		</tr>
 		<tr>
 			<td><label for="Mirror_Bootstrap">--mirror-bootstrap:</label> </td>
-			<td><input id="Mirror_Bootstrap" name="mirror_bootstrap" maxlength="256" size="50" type="text" value="LH_MIRROR_BOOTSTRAP" readonly /></td>
+			<td><input id="Mirror_Bootstrap" name="mirror_bootstrap" maxlength="256" size="50" type="text" value="LB_MIRROR_BOOTSTRAP" readonly /></td>
 		</tr>
 		<tr>
 			<td><label for="Mirror_Binary">--mirror-binary:</label> </td>
-			<td><input id="Mirror_Binary" name="mirror_binary" maxlength="256" size="50" type="text" value="LH_MIRROR_BINARY" /></td>
+			<td><input id="Mirror_Binary" name="mirror_binary" maxlength="256" size="50" type="text" value="LB_MIRROR_BINARY" /></td>
 		</tr>
 		<tr>
 			<td><label for="Mirror_Binary_Security">--mirror-binary-security:</label> </td>
-			<td><input id="Mirror_Binary_Security" name="mirror_binary_security" maxlength="256" size="50" type="text" value="LH_MIRROR_BINARY_SECURITY" readonly /></td>
+			<td><input id="Mirror_Binary_Security" name="mirror_binary_security" maxlength="256" size="50" type="text" value="LB_MIRROR_BINARY_SECURITY" readonly /></td>
 		</tr>
 		<tr>
 			<td><label for="Archive_Areas">--archive-areas:</label> </td>
diff --git a/templates/silo/debian.txt b/templates/silo/debian.txt
index fb2a49c..459adf5 100644
--- a/templates/silo/debian.txt
+++ b/templates/silo/debian.txt
@@ -1,8 +1,8 @@
 
                        Welcome to Debian GNU/Linux!
 
-This is a Debian LH_DISTRIBUTION live image.
-It was built on LH_DATE by live-build LH_VERSION.
+This is a Debian LB_DISTRIBUTION live image.
+It was built on LB_DATE by live-build LB_VERSION.
 
 You must have at least 64 megabytes of RAM to run this Debian Live system.
 
diff --git a/templates/silo/debian.txt.install b/templates/silo/debian.txt.install
index be095f9..a8d1bb6 100644
--- a/templates/silo/debian.txt.install
+++ b/templates/silo/debian.txt.install
@@ -1,8 +1,8 @@
 
                        Welcome to Debian GNU/Linux!
 
-This is a Debian LH_DISTRIBUTION combined live and installation image.
-It was built on LH_DATE by live-build LH_VERSION.
+This is a Debian LB_DISTRIBUTION combined live and installation image.
+It was built on LB_DATE by live-build LB_VERSION.
 
 You must have at least 64 megabytes of RAM to run this Debian Live system.
 
diff --git a/templates/syslinux/ca/f1.txt.install b/templates/syslinux/ca/f1.txt.install
index 89b0aaa..383ce1c 100644
--- a/templates/syslinux/ca/f1.txt.install
+++ b/templates/syslinux/ca/f1.txt.install
@@ -1,7 +1,7 @@
                   0fBenvingut a Debian GNU/Linux!07                               09F107
 
-Aix• ‚s un Debian {$LH_DISTRIBUTION} combinat live i d'instalúlaci˘ dins un {$LH_MEDIA}.
-Fet el {$LH_DATE}.
+Aix• ‚s un Debian {$LB_DISTRIBUTION} combinat live i d'instalúlaci˘ dins un {$LB_MEDIA}.
+Fet el {$LB_DATE}.
 
 0fMENŁ DE LES AJUDES07
 
@@ -9,7 +9,7 @@ Fet el {$LH_DATE}.
 
 <09F107>   Aquesta p…gina, l'ˇndex.
 <09F207>   Prerequisits per instalúlar Debian.
-<09F307>   MŠtodes d'arrencada per a usos especials d'aquest {$LH_MEDIA}.
+<09F307>   MŠtodes d'arrencada per a usos especials d'aquest {$LB_MEDIA}.
 <09F407>   MŠtodes addicionals d'arrencada; mode de rescat.
 <09F507>   Rep…s dels par…metres especials d'arrencada.
 <09F607>   Par…metres especials per algunes m…quines.
diff --git a/templates/syslinux/ca/f1.txt.live b/templates/syslinux/ca/f1.txt.live
index 327dd0f..f7b7525 100644
--- a/templates/syslinux/ca/f1.txt.live
+++ b/templates/syslinux/ca/f1.txt.live
@@ -1,7 +1,7 @@
                   0fBenvingut a Debian GNU/Linux!07                               09F107
 
-Aix• ‚s una Debian {$LH_DISTRIBUTION} live dins un {$LH_MEDIA}.
-Fet el {$LH_DATE}.
+Aix• ‚s una Debian {$LB_DISTRIBUTION} live dins un {$LB_MEDIA}.
+Fet el {$LB_DATE}.
 
 0fMENŁ DE LES AJUDES07
 
@@ -9,7 +9,7 @@ Fet el {$LH_DATE}.
 
 <09F107>   Aquesta p…gina, l'ˇndex.
 <09F207>   Prerequisits per instalúlar Debian.
-<09F307>   MŠtodes d'arrencada per a usos especials d'aquest {$LH_MEDIA}
+<09F307>   MŠtodes d'arrencada per a usos especials d'aquest {$LB_MEDIA}
 <09F407>   MŠtodes addicionals d'arrencada.
 <09F507>   Rep…s dels par…metres especials d'arrencada.
 <09F607>   Par…metres especials per algunes m…quines.
diff --git a/templates/syslinux/ca/f10.txt b/templates/syslinux/ca/f10.txt
index 3f438a9..217d106 100644
--- a/templates/syslinux/ca/f10.txt
+++ b/templates/syslinux/ca/f10.txt
@@ -12,7 +12,7 @@ la llei aplicable.
 
 ---
 
-Aquest sistema Debian Live ha estat constru‹t amb live-build, versi˘ {$LH_VERSION}.
+Aquest sistema Debian Live ha estat constru‹t amb live-build, versi˘ {$LB_VERSION}.
 
 M‚s informaci˘ del projecte Debian Live es pot trobar a 
 <http://live.debian.net/>.
diff --git a/templates/syslinux/ca/f3.txt.install b/templates/syslinux/ca/f3.txt.install
index efe30c4..9700bb2 100644
--- a/templates/syslinux/ca/f3.txt.install
+++ b/templates/syslinux/ca/f3.txt.install
@@ -3,7 +3,7 @@
 0fMŠtodes d'arrancada disponibles:07
 
 0flive07
-  Inicia el sistema live -- aquest es el mŠtode de {$LH_MEDIA} per defecte.
+  Inicia el sistema live -- aquest es el mŠtode de {$LB_MEDIA} per defecte.
 0flivefailsafe07
   Inicia el sistema en mode a prova de falles.
 0finstall07
diff --git a/templates/syslinux/ca/f3.txt.install.g-i b/templates/syslinux/ca/f3.txt.install.g-i
index 9138eb5..1dc0d97 100644
--- a/templates/syslinux/ca/f3.txt.install.g-i
+++ b/templates/syslinux/ca/f3.txt.install.g-i
@@ -3,7 +3,7 @@
 0fMŠtodes d'arrancada disponibles:07
 
 0flive07
-  Inicia el sistema live -- aquest es el mŠtode de {$LH_MEDIA} per defecte.
+  Inicia el sistema live -- aquest es el mŠtode de {$LB_MEDIA} per defecte.
 0flivefailsafe07
   Inicia el sistema en mode a prova de falles.
 0finstall07 or 0finstallgui07
diff --git a/templates/syslinux/ca/f3.txt.live b/templates/syslinux/ca/f3.txt.live
index bb3e23a..43e8cff 100644
--- a/templates/syslinux/ca/f3.txt.live
+++ b/templates/syslinux/ca/f3.txt.live
@@ -3,7 +3,7 @@
 0fMŠtodes d'arrancada disponibles:07
 
 0flive07
-  Inicia el sistema live -- aquest es el mŠtode de {$LH_MEDIA} per defecte.
+  Inicia el sistema live -- aquest es el mŠtode de {$LB_MEDIA} per defecte.
 0flivefailsafe07
   Inicia el sistema en mode a prova de falles.
 
diff --git a/templates/syslinux/en/f1.txt.install b/templates/syslinux/en/f1.txt.install
index 3d3965f..d31cefa 100644
--- a/templates/syslinux/en/f1.txt.install
+++ b/templates/syslinux/en/f1.txt.install
@@ -1,7 +1,7 @@
                   0fWelcome to Debian GNU/Linux!07                                09F107
 
-This is a Debian {$LH_DISTRIBUTION} combined live and installation {$LH_MEDIA}.
-It was built on {$LH_DATE}.
+This is a Debian {$LB_DISTRIBUTION} combined live and installation {$LB_MEDIA}.
+It was built on {$LB_DATE}.
 
 0fHELP INDEX07
 
@@ -9,7 +9,7 @@ It was built on {$LH_DATE}.
 
 <09F107>   This page, the help index.
 <09F207>   Prerequisites for installing Debian.
-<09F307>   Boot methods for special ways of using this {$LH_MEDIA}
+<09F307>   Boot methods for special ways of using this {$LB_MEDIA}
 <09F407>   Additional boot methods; rescue mode.
 <09F507>   Special boot parameters, overview.
 <09F607>   Special boot parameters for special machines.
diff --git a/templates/syslinux/en/f1.txt.live b/templates/syslinux/en/f1.txt.live
index 8c550e0..4075fee 100644
--- a/templates/syslinux/en/f1.txt.live
+++ b/templates/syslinux/en/f1.txt.live
@@ -1,7 +1,7 @@
                   0fWelcome to Debian GNU/Linux!07                                09F107
 
-This is a Debian {$LH_DISTRIBUTION} live {$LH_MEDIA}.
-It was built on {$LH_DATE}.
+This is a Debian {$LB_DISTRIBUTION} live {$LB_MEDIA}.
+It was built on {$LB_DATE}.
 
 0fHELP INDEX07
 
@@ -9,7 +9,7 @@ It was built on {$LH_DATE}.
 
 <09F107>   This page, the help index.
 <09F207>   Prerequisites for installing Debian.
-<09F307>   Boot methods for special ways of using this {$LH_MEDIA}
+<09F307>   Boot methods for special ways of using this {$LB_MEDIA}
 <09F407>   Additional boot methods.
 <09F507>   Special boot parameters, overview.
 <09F607>   Special boot parameters for special machines.
diff --git a/templates/syslinux/en/f10.txt b/templates/syslinux/en/f10.txt
index d24850b..6780e67 100644
--- a/templates/syslinux/en/f10.txt
+++ b/templates/syslinux/en/f10.txt
@@ -12,7 +12,7 @@ permitted by applicable law.
 
 ---
 
-This Debian Live system was built with live-build, version {$LH_VERSION}.
+This Debian Live system was built with live-build, version {$LB_VERSION}.
 
 More information about the Debian Live project can be found at
 <http://live.debian.net/>.
diff --git a/templates/syslinux/en/f3.txt.install b/templates/syslinux/en/f3.txt.install
index 59c2d27..847c6ef 100644
--- a/templates/syslinux/en/f3.txt.install
+++ b/templates/syslinux/en/f3.txt.install
@@ -3,7 +3,7 @@
 0fAvailable boot methods:07
 
 0flive07
-  Start the live system -- this is the default {$LH_MEDIA} method.
+  Start the live system -- this is the default {$LB_MEDIA} method.
 0flivefailsafe07
   Start the live system in fail-safe mode.
 0finstall07
diff --git a/templates/syslinux/en/f3.txt.install.g-i b/templates/syslinux/en/f3.txt.install.g-i
index 2a49e50..e5fa7ba 100644
--- a/templates/syslinux/en/f3.txt.install.g-i
+++ b/templates/syslinux/en/f3.txt.install.g-i
@@ -3,7 +3,7 @@
 0fAvailable boot methods:07
 
 0flive07
-  Start the live system -- this is the default {$LH_MEDIA} method.
+  Start the live system -- this is the default {$LB_MEDIA} method.
 0flivefailsafe07
   Start the live system in fail-safe mode.
 0finstall07 or 0finstallgui07
diff --git a/templates/syslinux/en/f3.txt.live b/templates/syslinux/en/f3.txt.live
index 87a17d0..d602ccc 100644
--- a/templates/syslinux/en/f3.txt.live
+++ b/templates/syslinux/en/f3.txt.live
@@ -3,7 +3,7 @@
 0fAvailable boot methods:07
 
 0flive07
-  Start the live system -- this is the default {$LH_MEDIA} method.
+  Start the live system -- this is the default {$LB_MEDIA} method.
 0flivefailsafe07
   Start the live system in fail-safe mode.
 
diff --git a/templates/syslinux/es/f1.txt.install b/templates/syslinux/es/f1.txt.install
index eb84626..da9c0e4 100644
--- a/templates/syslinux/es/f1.txt.install
+++ b/templates/syslinux/es/f1.txt.install
@@ -1,7 +1,7 @@
                   0f­Bienvenido a Debian GNU/Linux!07                             09F107
 
-Esto es una Debian {$LH_DISTRIBUTION} combinada live e instalaci˘n de {$LH_MEDIA}.
-Fue construida el {$LH_DATE}.
+Esto es una Debian {$LB_DISTRIBUTION} combinada live e instalaci˘n de {$LB_MEDIA}.
+Fue construida el {$LB_DATE}.
 
 0fMENŁ DE AYUDA07
 
@@ -9,7 +9,7 @@ Fue construida el {$LH_DATE}.
 
 <09F107>   Esta p gina, el ˇndice.
 <09F207>   Prerrequisitos para instalar Debian.
-<09F307>   M‚todos de arranques especiales usando este {$LH_MEDIA}
+<09F307>   M‚todos de arranques especiales usando este {$LB_MEDIA}
 <09F407>   M‚todos adicionales de arranque; modo de rescate.
 <09F507>   Repaso de los par metros especiales de arranque.
 <09F607>   Par metros especiales para algunas m quinas especiales.
diff --git a/templates/syslinux/es/f1.txt.live b/templates/syslinux/es/f1.txt.live
index a9099b3..378e34b 100644
--- a/templates/syslinux/es/f1.txt.live
+++ b/templates/syslinux/es/f1.txt.live
@@ -1,7 +1,7 @@
                   0f­Bienvenido a Debian GNU/Linux!07                               09F107
 
-Esto es una Debian {$LH_DISTRIBUTION} live de {$LH_MEDIA}.
-Fue construida el {$LH_DATE}.
+Esto es una Debian {$LB_DISTRIBUTION} live de {$LB_MEDIA}.
+Fue construida el {$LB_DATE}.
 
 0fMENŁ DE AYUDA07
 
@@ -9,7 +9,7 @@ Fue construida el {$LH_DATE}.
 
 <09F107>   Esta p gina, el ˇndice.
 <09F207>   Prerrequisitos para instalar Debian.
-<09F307>   M‚todos de arranques especiales usando este {$LH_MEDIA}.
+<09F307>   M‚todos de arranques especiales usando este {$LB_MEDIA}.
 <09F407>   M‚todos adicionales de arranque.
 <09F507>   Repaso de los par metros especiales de arranque.
 <09F607>   Par metros especiales para algunas m quinas especiales.
diff --git a/templates/syslinux/es/f10.txt b/templates/syslinux/es/f10.txt
index b281306..36eedd7 100644
--- a/templates/syslinux/es/f10.txt
+++ b/templates/syslinux/es/f10.txt
@@ -12,7 +12,7 @@ permitido por la ley.
 
 ---
 
-Este sistema Debian Live se construy˘ con live-build, versi˘n {$LH_VERSION}.
+Este sistema Debian Live se construy˘ con live-build, versi˘n {$LB_VERSION}.
 
 M s informaci˘n en sobre el proyecto Debian Live puede encontrarse en 
 <http://live.debian.net/>.
diff --git a/templates/syslinux/es/f3.txt.install b/templates/syslinux/es/f3.txt.install
index eaabd69..86d8d48 100644
--- a/templates/syslinux/es/f3.txt.install
+++ b/templates/syslinux/es/f3.txt.install
@@ -3,7 +3,7 @@
 0fM‚todos de arranque disponibles:07
 
 0flive07
-  Inicia el sistema live -- ‚ste es el sistema en {$LH_MEDIA} predeterminado.
+  Inicia el sistema live -- ‚ste es el sistema en {$LB_MEDIA} predeterminado.
 0flivefailsafe07
   Inicia el sistema live en modo a prueba de fallos.
 0finstall07
diff --git a/templates/syslinux/es/f3.txt.install.g-i b/templates/syslinux/es/f3.txt.install.g-i
index 6a7ade5..7b18708 100644
--- a/templates/syslinux/es/f3.txt.install.g-i
+++ b/templates/syslinux/es/f3.txt.install.g-i
@@ -3,7 +3,7 @@
 0fM‚todos de arranque disponibles:07
 
 0flive07
-  Inicia el sistema live -- ‚ste es el sistema en {$LH_MEDIA} por defecto.
+  Inicia el sistema live -- ‚ste es el sistema en {$LB_MEDIA} por defecto.
 0flivefailsafe07
   Inicia el sistema live en modo a prueba de fallos.
 0finstall07 or 0finstallgui07
diff --git a/templates/syslinux/es/f3.txt.live b/templates/syslinux/es/f3.txt.live
index 48da40c..e9291ae 100644
--- a/templates/syslinux/es/f3.txt.live
+++ b/templates/syslinux/es/f3.txt.live
@@ -3,7 +3,7 @@
 0fM‚todos de arranque disponibles:07
 
 0flive07
-  Inicia el sistema live -- ‚ste es el sistema en {$LH_MEDIA} por defecto.
+  Inicia el sistema live -- ‚ste es el sistema en {$LB_MEDIA} por defecto.
 0flivefailsafe07
   Inicia el sistema live en modo a prueba de fallos.
 
diff --git a/templates/syslinux/menu/syslinux.cfg b/templates/syslinux/menu/syslinux.cfg
index fa55a7c..3397e3c 100644
--- a/templates/syslinux/menu/syslinux.cfg
+++ b/templates/syslinux/menu/syslinux.cfg
@@ -1,4 +1,4 @@
 include menu.cfg
 default {$LIVE_DATA_PATH}/vesamenu.c32
 prompt 0
-timeout {$LH_SYSLINUX_TIMEOUT}
+timeout {$LB_SYSLINUX_TIMEOUT}
diff --git a/templates/syslinux/normal/prompt.cfg b/templates/syslinux/normal/prompt.cfg
index 0e82c43..5f64eb6 100644
--- a/templates/syslinux/normal/prompt.cfg
+++ b/templates/syslinux/normal/prompt.cfg
@@ -1,5 +1,5 @@
 prompt 1
-timeout {$LH_SYSLINUX_TIMEOUT}
+timeout {$LB_SYSLINUX_TIMEOUT}
 default live
 display {$LIVE_SCREEN_PATH}/boot.txt
 include {$LIVE_SCREEN_PATH}/menu.cfg
diff --git a/templates/syslinux/pt_BR/f1.txt.install b/templates/syslinux/pt_BR/f1.txt.install
index a5dd185..d21c1e8 100644
--- a/templates/syslinux/pt_BR/f1.txt.install
+++ b/templates/syslinux/pt_BR/f1.txt.install
@@ -1,7 +1,7 @@
                   0fBem vindo(a) ao Debian GNU/Linux!07                                09F107
 
-Este é o Debian {$LH_DISTRIBUTION} combinando um sistema live e instalação
-{$LH_MEDIA}. Ele foi construĂ­do em {$LH_DATE}.
+Este é o Debian {$LB_DISTRIBUTION} combinando um sistema live e instalação
+{$LB_MEDIA}. Ele foi construĂ­do em {$LB_DATE}.
 
 0fĂŤNDICE DE AJUDA07
 
@@ -9,7 +9,7 @@ Este é o Debian {$LH_DISTRIBUTION} combinando um sistema live e instalação
 
 <09F107>   Página atual, o índice de ajuda.
 <09F207>   Pre-requisitos para instalar o Debian.
-<09F307>   Métodos especiais de inicialização para usar neste {$LH_MEDIA}
+<09F307>   Métodos especiais de inicialização para usar neste {$LB_MEDIA}
 <09F407>   Métodos adicionais de inicialização; modo de recuperação.
 <09F507>   Parâmetros de inicialização especiais, visão geral.
 <09F607>   Parâmetros de inicialização especiais para máquinas específicas.
diff --git a/templates/syslinux/pt_BR/f1.txt.live b/templates/syslinux/pt_BR/f1.txt.live
index a77aa64..db5c045 100644
--- a/templates/syslinux/pt_BR/f1.txt.live
+++ b/templates/syslinux/pt_BR/f1.txt.live
@@ -1,7 +1,7 @@
                   0fBem vindo(a) ao Debian GNU/Linux!07                                09F107
 
-Este Ă© o Debian {$LH_DISTRIBUTION} live {$LH_MEDIA}.
-{$LH_MEDIA}. Ele foi construĂ­do em {$LH_DATE}.
+Este Ă© o Debian {$LB_DISTRIBUTION} live {$LB_MEDIA}.
+{$LB_MEDIA}. Ele foi construĂ­do em {$LB_DATE}.
 
 0fĂŤNDICE DE AJUDA07
 
@@ -9,7 +9,7 @@ Este Ă© o Debian {$LH_DISTRIBUTION} live {$LH_MEDIA}.
 
 <09F107>   Página atual, o índice de ajuda.
 <09F207>   Pre-requisitos para instalar o Debian.
-<09F307>   Métodos especiais de inicialização para usar neste {$LH_MEDIA}
+<09F307>   Métodos especiais de inicialização para usar neste {$LB_MEDIA}
 <09F407>   Métodos adicionais de inicialização.
 <09F507>   Parâmetros de inicialização especiais, visão geral.
 <09F607>   Parâmetros de inicialização especiais para máquinas específicas.
diff --git a/templates/syslinux/pt_BR/f10.txt b/templates/syslinux/pt_BR/f10.txt
index 245420e..a11b734 100644
--- a/templates/syslinux/pt_BR/f10.txt
+++ b/templates/syslinux/pt_BR/f10.txt
@@ -13,7 +13,7 @@ permitido pela lei aplicável.
 
 ---
 
-Este sistema Live do Debian foi construĂ­do com live-build, versĂŁo {$LH_VERSION}.
+Este sistema Live do Debian foi construĂ­do com live-build, versĂŁo {$LB_VERSION}.
 
 Mais informações sobre o projeto Debian Live podem ser encontrada em
 <http://live.debian.net/>.
diff --git a/templates/syslinux/pt_BR/f3.txt.install b/templates/syslinux/pt_BR/f3.txt.install
index 560feca..d6017f9 100644
--- a/templates/syslinux/pt_BR/f3.txt.install
+++ b/templates/syslinux/pt_BR/f3.txt.install
@@ -3,7 +3,7 @@
 0fMétodos de inicilização disponíveis:07
 
 0flive07
-  Inicia o sistema live -- este é o método {$LH_MEDIA} padrão.
+  Inicia o sistema live -- este é o método {$LB_MEDIA} padrão.
 0flivefailsafe07
   Inicia o sistema live em modo de segurança (fail-safe).
 0finstall07
diff --git a/templates/syslinux/pt_BR/f3.txt.install.g-i b/templates/syslinux/pt_BR/f3.txt.install.g-i
index 205d3a8..9a6b7cc 100644
--- a/templates/syslinux/pt_BR/f3.txt.install.g-i
+++ b/templates/syslinux/pt_BR/f3.txt.install.g-i
@@ -3,7 +3,7 @@
 0fmétodos de inicilização disponíveis:07
 
 0flive07
-  Inicia o sistema live -- este é o método {$LH_MEDIA} padrão.
+  Inicia o sistema live -- este é o método {$LB_MEDIA} padrão.
 0flivefailsafe07
   Inicia o sistema live em modo de segurança (fail-safe).
 0finstall07  ou 0finstallgui07
diff --git a/templates/syslinux/pt_BR/f3.txt.live b/templates/syslinux/pt_BR/f3.txt.live
index cdf791a..d83060d 100644
--- a/templates/syslinux/pt_BR/f3.txt.live
+++ b/templates/syslinux/pt_BR/f3.txt.live
@@ -3,7 +3,7 @@
 0fMétodos de inicialização disponíveis:07
 
 0flive07
-  Inicia o sistema live -- este é o método {$LH_MEDIA} padrão.
+  Inicia o sistema live -- este é o método {$LB_MEDIA} padrão.
 0flivefailsafe07
   Inicia o sistema live em modo de segurança (fail-safe).
 
diff --git a/templates/yaboot/boot.msg b/templates/yaboot/boot.msg
index 98f5876..b183c67 100644
--- a/templates/yaboot/boot.msg
+++ b/templates/yaboot/boot.msg
@@ -1,7 +1,7 @@
 Welcome to Debian GNU/Linux!
 
 This is a Debian Live CDROM,
-built on LH_DATE.
+built on LB_DATE.
 
 The default option is 'live'.
 
diff --git a/templates/yaboot/pegasos b/templates/yaboot/pegasos
index 1e1b241..a84396a 100644
--- a/templates/yaboot/pegasos
+++ b/templates/yaboot/pegasos
@@ -18,7 +18,7 @@
   ." Welcome to Debian GNU/Linux!"				cr
   ." "								cr
   ." This is a Debian Live CDROM,"				cr
-  ." built on LH_DATE."						cr
+  ." built on LB_DATE."						cr
   ." "								cr
   ." The default option is 'live'."				cr
   ." "								cr