diff --git a/data/y-web/Makefile.am b/data/y-web/Makefile.am
index 7fc85862b..8e385ccca 100644
--- a/data/y-web/Makefile.am
+++ b/data/y-web/Makefile.am
@@ -14,6 +14,7 @@ install_DATA =	channels.js \
 		Y_About.yhtm \
 		Y_Baselib.js \
 		Y_Blocks.txt \
+		Y_Blocks_Neutrino.txt \
 		Y_Boxcontrol_Bouquet_Editor_Edit.yhtm \
 		Y_Boxcontrol_Bouquet_Editor_Main.yhtm \
 		Y_Boxcontrol_Bouquetlist.yhtm \
@@ -38,7 +39,6 @@ install_DATA =	channels.js \
 		Y_Live_EPG.yhtm \
 		Y_Main.css \
 		Y_Menue.yhtm \
-		Y_neutrino_Blocks.txt \
 		Y_Refresh.yhtm \
 		Y_Settings_automount_liste.yhtm \
 		Y_Settings_automount.yhtm \
@@ -79,9 +79,9 @@ install_DATA =	channels.js \
 # file manager
 install_DATA +=	accordion.js \
 		effects.js \
+		Y_Blocks_Filemgr.txt \
 		Y_Filemgr.yhtm \
-		Y_Filemgr_Edit.yhtm \
-		Y_Filemgr_blocks.txt
+		Y_Filemgr_Edit.yhtm
 
 # NI-yWeb
 install_DATA += Y_NIlib.js \
diff --git a/data/y-web/Y_Filemgr_blocks.txt b/data/y-web/Y_Blocks_Filemgr.txt
similarity index 100%
rename from data/y-web/Y_Filemgr_blocks.txt
rename to data/y-web/Y_Blocks_Filemgr.txt
diff --git a/data/y-web/Y_neutrino_Blocks.txt b/data/y-web/Y_Blocks_Neutrino.txt
similarity index 100%
rename from data/y-web/Y_neutrino_Blocks.txt
rename to data/y-web/Y_Blocks_Neutrino.txt
diff --git a/data/y-web/Y_Filemgr_Edit.yhtm b/data/y-web/Y_Filemgr_Edit.yhtm
index 5812c7257..092c3d900 100644
--- a/data/y-web/Y_Filemgr_Edit.yhtm
+++ b/data/y-web/Y_Filemgr_Edit.yhtm
@@ -55,7 +55,7 @@ function ni(){
 				<td title="close without save"><a href='javascript:window.close()'><img src="/images/cross.png"/></a></td>
 			</tr>
 			</table>
-	<form name="f" accept-charset="UTF-8" action="/y/cgi?execute=include-block:Y_Filemgr_blocks.txt;edit_save_settings;nix" method="POST">
+	<form name="f" accept-charset="UTF-8" action="/y/cgi?execute=include-block:Y_Blocks_Filemgr.txt;edit_save_settings;nix" method="POST">
 		<textarea id="txt" name="editfile" cols="100" rows="31"  wrap="off" title="Editor" style="width: 100%;">{=include:{=file=}=}</textarea>
 		<input type="hidden" name="tmpl" value="Y_Filemgr_Edit.yhtm"/>
 		<input type="hidden" name="file" value="{=file=}"/>
diff --git a/data/y-web/Y_Settings_automount_liste.yhtm b/data/y-web/Y_Settings_automount_liste.yhtm
index 901c35a7b..6aa767b0d 100644
--- a/data/y-web/Y_Settings_automount_liste.yhtm
+++ b/data/y-web/Y_Settings_automount_liste.yhtm
@@ -51,6 +51,6 @@ function do_delete()
 	</form>
 	</div>
 </div>
-{=include-block:Y_neutrino_Blocks.txt;neutrino_form_helpbox=}
+{=include-block:Y_Blocks_Neutrino.txt;neutrino_form_helpbox=}
 </body>
 </html>
\ No newline at end of file
diff --git a/data/y-web/Y_Settings_mount_liste.yhtm b/data/y-web/Y_Settings_mount_liste.yhtm
index a79620cc9..c83b4e9dc 100644
--- a/data/y-web/Y_Settings_mount_liste.yhtm
+++ b/data/y-web/Y_Settings_mount_liste.yhtm
@@ -40,6 +40,6 @@ function do_edit()
 	</form>
 	</div>
 </div>
-{=include-block:Y_neutrino_Blocks.txt;neutrino_form_helpbox=}
+{=include-block:Y_Blocks_Neutrino.txt;neutrino_form_helpbox=}
 </body>
 </html>
\ No newline at end of file
diff --git a/data/y-web/Y_Settings_neutrino_forms.yhtm b/data/y-web/Y_Settings_neutrino_forms.yhtm
index 2987db99d..5684444c4 100644
--- a/data/y-web/Y_Settings_neutrino_forms.yhtm
+++ b/data/y-web/Y_Settings_neutrino_forms.yhtm
@@ -1,2 +1,2 @@
 {=var-set:neutrino={=form=}=}
-{=include-block:Y_neutrino_Blocks.txt;neutrino_form=}
+{=include-block:Y_Blocks_Neutrino.txt;neutrino_form=}
diff --git a/data/y-web/Y_Timer_Edit.yhtm b/data/y-web/Y_Timer_Edit.yhtm
index e910b46c7..2e9091a59 100644
--- a/data/y-web/Y_Timer_Edit.yhtm
+++ b/data/y-web/Y_Timer_Edit.yhtm
@@ -164,7 +164,7 @@ function init()
 			<tr id="RecDirRow" style="display:none">
 				<td>{=L:live.timer_edit.rec_dir=}:</td>
 				<td>
-				{=include-block:Y_neutrino_Blocks.txt;neutrino_list_record_dirs=}
+				{=include-block:Y_Blocks_Neutrino.txt;neutrino_list_record_dirs=}
 				</td>
 			</tr>
 		</table>