diff --git a/programs/cmm/kolibri font viewer/Tupfile.lua b/programs/cmm/kf_font_viewer/Tupfile.lua
similarity index 57%
rename from programs/cmm/kolibri font viewer/Tupfile.lua
rename to programs/cmm/kf_font_viewer/Tupfile.lua
index b5603cbba0..e6084acb0e 100644
--- a/programs/cmm/kolibri font viewer/Tupfile.lua	
+++ b/programs/cmm/kf_font_viewer/Tupfile.lua
@@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru"
 then C_LANG = "LANG_RUS"
 else C_LANG = "LANG_ENG" -- this includes default case without config
 end
-tup.rule("kolibri font viewer.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "kolibri font viewer.com")
+tup.rule("font_viewer.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "font_viewer.com")
diff --git a/programs/cmm/kf_font_viewer/compile.bat b/programs/cmm/kf_font_viewer/compile.bat
new file mode 100644
index 0000000000..8201eb2113
--- /dev/null
+++ b/programs/cmm/kf_font_viewer/compile.bat
@@ -0,0 +1,5 @@
+C-- "font_viewer.c"
+@del "font_viewer"
+@rename "font_viewer.com" "font_viewer"
+@del warning.txt
+@pause
\ No newline at end of file
diff --git a/programs/cmm/kolibri font viewer/font/Tahoma.kf b/programs/cmm/kf_font_viewer/font/Tahoma.kf
similarity index 100%
rename from programs/cmm/kolibri font viewer/font/Tahoma.kf
rename to programs/cmm/kf_font_viewer/font/Tahoma.kf
diff --git a/programs/cmm/kolibri font viewer/font/Verdana.kf b/programs/cmm/kf_font_viewer/font/Verdana.kf
similarity index 100%
rename from programs/cmm/kolibri font viewer/font/Verdana.kf
rename to programs/cmm/kf_font_viewer/font/Verdana.kf
diff --git a/programs/cmm/kolibri font viewer/kolibri font viewer.c b/programs/cmm/kf_font_viewer/font_viewer.c
similarity index 100%
rename from programs/cmm/kolibri font viewer/kolibri font viewer.c
rename to programs/cmm/kf_font_viewer/font_viewer.c
diff --git a/programs/cmm/kolibri font viewer/compile original font.bat b/programs/cmm/kolibri font viewer/compile original font.bat
deleted file mode 100644
index ead5c408ee..0000000000
--- a/programs/cmm/kolibri font viewer/compile original font.bat	
+++ /dev/null
@@ -1,10 +0,0 @@
-C-- "kolibri font viewer.c"
-@del "kolibri font viewer"
-@rename "kolibri font viewer.com" "kolibri font viewer"
-kpack "kolibri font viewer"
-@del warning.txt
-@pause
-@rem ====== Automatically add binnary to kolibri.img and then run QEMU =====
-@rem"C:\Program Files (x86)\WinImage\WINIMAGE.exe" D:\Kolibri\work\QEMU\kolibri.img  /I /H/Q C:\Users\Leency\Dropbox\CMM\example\example
-@rem @cd /d C:\Work\QEMU
-@rem C:\Work\QEMU\kolibri_qumu.bat
\ No newline at end of file