diff --git a/README.md b/README.md
index 5f0ef87c..900c08f3 100644
--- a/README.md
+++ b/README.md
@@ -74,9 +74,9 @@ Specifications
 How to use "as is" ?
 --------------------
 
-The executable file is parse_args, for example:
+The executable file is yunohost, for example:
 
-    ./parse_args user create
+    ./yunohost user create
 
 
 Contribute / FAQ
@@ -88,7 +88,7 @@ Contribute / FAQ
 We decided to regroup all YunoHost related operations into a single program called "moulinette". This will allow us to entirely manipulate our YunoHost instances through a wonderful CLI. Additionally the web interface will just have to call the same "moulinette" functions. Magic power inside :p
 
 ### Important files
-* `` parse_args `` File executed on function calling - i.e `` ./parse_args user create ``. Will be renamed `` yunohost `` when packaged.
+* `` yunohost `` File executed on function calling - i.e `` ./yunohost user create ``.
 * `` action_map.yml `` Defines all CLI actions and links arguments.
 * `` yunohost.py `` Contains all YunoHost functions likely to be shared between moulinette files. Also contains service connections classes (erk).
 * `` yunohost_*.py `` Files containing action functions. `` * `` is the category: user, domain, firewall, etc.
diff --git a/action_map.yml b/action_map.yml
index 67b10ffd..f4dddc98 100644
--- a/action_map.yml
+++ b/action_map.yml
@@ -466,7 +466,7 @@ firewall:
         ### firewall_list()
         list:
             action_help: List all firewall rules
-        
+
         ### firewall_reload()
         reload:
             action_help: Reload  all firewall rules
diff --git a/bash/yunohost-cli b/bash/yunohost-cli
index a3fd774a..41eaf057 100755
--- a/bash/yunohost-cli
+++ b/bash/yunohost-cli
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 cd /usr/share/pyshared/yunohost-cli/
-python parse_args $@
+python yunohost $@
diff --git a/parse_args b/yunohost
similarity index 100%
rename from parse_args
rename to yunohost