diff --git a/ftplugin/rst/blogger.vim b/ftplugin/rst/blogger.vim
index e9a67a6..ec84ef9 100644
--- a/ftplugin/rst/blogger.vim
+++ b/ftplugin/rst/blogger.vim
@@ -24,8 +24,8 @@ if !exists("g:blogger_pass")
     let g:blogger_pass = ""
 endif
 
-map <F5> :call <SID>Restify()<cr>
-map <F6> :call <SID>Rst2Blogger()<cr>
+map <F6> :call <SID>Restify()<cr>
+map <F7> :call <SID>Rst2Blogger()<cr>
 
 if !exists('*s:Restify')
     python << EOF
@@ -38,9 +38,11 @@ import vim
 
 scriptdir = os.path.dirname(vim.eval('expand("<sfile>")'))
 sys.path.insert(0, scriptdir)
-from bloggervim.rest import blogPreview, blogArticleString
-from bloggervim.blogger import VimBlogger
-
+try:
+    from vimblogger.rest import blogPreview, blogArticleString
+    from vimblogger.blogger import VimBlogger
+except ImportError:
+    print "Plugin blogger cannot be loaded, due to lack of required modules"
 #}}}
 EOF
 
diff --git a/ftplugin/rst/commons.vim b/ftplugin/rst/commons.vim
index 3574eeb..ec045de 100644
--- a/ftplugin/rst/commons.vim
+++ b/ftplugin/rst/commons.vim
@@ -1,10 +1,11 @@
 " Some common settings for all reSt files
 setlocal textwidth=80
-setlocal makeprg=rst2html.py\ %\ %.html
+setlocal makeprg=rst2html.py\ \"%\"\ \"%:p:r.html\"
 setlocal spell
 setlocal smartindent
 setlocal autoindent
 setlocal formatoptions=tcq "set VIms default
+
 let g:blogger_login="gryf73"
 let g:blogger_name="rdobosz"
 let g:blogger_browser=1
diff --git a/ftplugin/rst/bloggervim/blogger.py b/ftplugin/rst/vimblogger/blogger.py
similarity index 100%
rename from ftplugin/rst/bloggervim/blogger.py
rename to ftplugin/rst/vimblogger/blogger.py
diff --git a/ftplugin/rst/bloggervim/rest.py b/ftplugin/rst/vimblogger/rest.py
similarity index 100%
rename from ftplugin/rst/bloggervim/rest.py
rename to ftplugin/rst/vimblogger/rest.py