diff --git a/data/y-web/Y_Blocks.txt b/data/y-web/Y_Blocks.txt
index 57ccdf5cd..5c7ff0abf 100644
--- a/data/y-web/Y_Blocks.txt
+++ b/data/y-web/Y_Blocks.txt
@@ -310,8 +310,8 @@ start-block~head_ni
 	yhttpd_cache_clear('');
 //]]>
 </script>
-{=include-block:Y_Blocks.txt;jQuery=}
-{=include-block:Y_Blocks.txt;jQuery_ui=}
+{=include-block:Y_Blocks.txt;js_jquery=}
+{=include-block:Y_Blocks.txt;js_jquery_ui=}
 end-block~head_ni
 
 # ------- Lay-HEAD close
@@ -321,7 +321,7 @@ end-block~head_close
 
 # ============= jQuery
 # ------- jQuery library
-start-block~jQuery
+start-block~js_jquery
 <script type="text/javascript" src="/jquery/jquery.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
@@ -329,12 +329,12 @@ start-block~jQuery
 	jQuery.noConflict();
 //]]>
 </script>
-end-block~jQuery
+end-block~js_jquery
 
 # ------- jQuery user interface
-start-block~jQuery_ui
+start-block~js_jquery_ui
 <script type="text/javascript" src="/jquery/jquery-ui.min.js"></script>
-end-block~jQuery_ui
+end-block~js_jquery_ui
 
 # ------- nhttpd save Settings
 start-block~start_wizard_save_settings
diff --git a/data/y-web/Y_Boxcontrol_Messages.yhtm b/data/y-web/Y_Boxcontrol_Messages.yhtm
index be3e7cc3a..85027e706 100644
--- a/data/y-web/Y_Boxcontrol_Messages.yhtm
+++ b/data/y-web/Y_Boxcontrol_Messages.yhtm
@@ -1,6 +1,6 @@
 {=var-set:cancache=yPyes=}
 {=include-block:Y_Blocks.txt;head=}
-{=include-block:Y_Blocks.txt;jQuery=}
+{=include-block:Y_Blocks.txt;js_jquery=}
 <script type="text/javascript" src="/Y_Baselib.js"></script>
 <script type="text/javascript" src="/Y_yweb.js"></script>
 <script type="text/javascript">
diff --git a/data/y-web/Y_Timer_Edit.yhtm b/data/y-web/Y_Timer_Edit.yhtm
index 2af9b8c72..0b342a97a 100644
--- a/data/y-web/Y_Timer_Edit.yhtm
+++ b/data/y-web/Y_Timer_Edit.yhtm
@@ -1,7 +1,7 @@
 {=func:set_timer_form {=typ=} {=tid=}=}
 {=include-block:Y_Blocks.txt;head_no_charset=}
 <meta http-equiv="Content-Type" content="text/html; charset=windows-1252"/>
-{=include-block:Y_Blocks.txt;jQuery=}
+{=include-block:Y_Blocks.txt;js_jquery=}
 <script type="text/javascript" src="/Y_Baselib.js"></script>
 <script type="text/javascript">
 //<![CDATA[
diff --git a/data/y-web/Y_Tools_Boxcontrol.yhtm b/data/y-web/Y_Tools_Boxcontrol.yhtm
index 1b5d7a8f5..932c16552 100644
--- a/data/y-web/Y_Tools_Boxcontrol.yhtm
+++ b/data/y-web/Y_Tools_Boxcontrol.yhtm
@@ -1,6 +1,6 @@
 {=var-set:cancache=yPyes=}
 {=include-block:Y_Blocks.txt;head=}
-{=include-block:Y_Blocks.txt;jQuery=}
+{=include-block:Y_Blocks.txt;js_jquery=}
 <script type="text/javascript" src="/Y_Baselib.js"></script>
 <script type="text/javascript">
 //<![CDATA[
diff --git a/data/y-web/Y_Tools_Check_Install.yhtm b/data/y-web/Y_Tools_Check_Install.yhtm
index 600302b59..d4cb5fe13 100644
--- a/data/y-web/Y_Tools_Check_Install.yhtm
+++ b/data/y-web/Y_Tools_Check_Install.yhtm
@@ -1,5 +1,5 @@
 {=include-block:Y_Blocks.txt;head=}
-{=include-block:Y_Blocks.txt;jQuery=}
+{=include-block:Y_Blocks.txt;js_jquery=}
 <script type="text/javascript" src="/Y_Baselib.js"></script>
 <script type="text/javascript">
 //<![CDATA[
diff --git a/data/y-web/Y_Tools_Screenshot.yhtm b/data/y-web/Y_Tools_Screenshot.yhtm
index 5d5105f79..9a92096c7 100644
--- a/data/y-web/Y_Tools_Screenshot.yhtm
+++ b/data/y-web/Y_Tools_Screenshot.yhtm
@@ -2,8 +2,8 @@
 {=var-set:fbshot={=find-exec:fbshot=}=}
 
 {=include-block:Y_Blocks.txt;head=}
-{=include-block:Y_Blocks.txt;jQuery=}
-{=include-block:Y_Blocks.txt;jQuery_ui=}
+{=include-block:Y_Blocks.txt;js_jquery=}
+{=include-block:Y_Blocks.txt;js_jquery_ui=}
 <script type="text/javascript" src="/Y_Baselib.js"></script>
 <script type="text/javascript">
 //<![CDATA[
diff --git a/data/y-web/Y_Tools_Screenshot_GraphLCD.yhtm b/data/y-web/Y_Tools_Screenshot_GraphLCD.yhtm
index b41bb34bf..186f387b2 100644
--- a/data/y-web/Y_Tools_Screenshot_GraphLCD.yhtm
+++ b/data/y-web/Y_Tools_Screenshot_GraphLCD.yhtm
@@ -1,5 +1,5 @@
 {=include-block:Y_Blocks.txt;head=}
-{=include-block:Y_Blocks.txt;jQuery=}
+{=include-block:Y_Blocks.txt;js_jquery=}
 <script type="text/javascript" src="/Y_Baselib.js"></script>
 <script type="text/javascript">
 //<![CDATA[
diff --git a/data/y-web/Y_Tools_Screenshot_LCD4Linux.yhtm b/data/y-web/Y_Tools_Screenshot_LCD4Linux.yhtm
index c943682db..184cb398f 100644
--- a/data/y-web/Y_Tools_Screenshot_LCD4Linux.yhtm
+++ b/data/y-web/Y_Tools_Screenshot_LCD4Linux.yhtm
@@ -1,5 +1,5 @@
 {=include-block:Y_Blocks.txt;head=}
-{=include-block:Y_Blocks.txt;jQuery=}
+{=include-block:Y_Blocks.txt;js_jquery=}
 <script type="text/javascript">
 //<![CDATA[
 var interval;