diff --git a/contrib/ironic/ironic-fa-deploy/ironic_fa_deploy/modules/fuel_agent.py b/contrib/ironic/ironic-fa-deploy/ironic_fa_deploy/modules/fuel_agent.py
index 7aa0d53..28fa2a6 100644
--- a/contrib/ironic/ironic-fa-deploy/ironic_fa_deploy/modules/fuel_agent.py
+++ b/contrib/ironic/ironic-fa-deploy/ironic_fa_deploy/modules/fuel_agent.py
@@ -72,8 +72,8 @@ OTHER_PROPERTIES = {
     'fuel_key_filename': _('Name of SSH private key file; default is '
                            '"/etc/ironic/fuel_key". Optional.'),
     'fuel_ssh_port': _('SSH port; default is 22. Optional.'),
-    'fuel_deploy_script': _('path to Fuel Agent executable entry point; '
-                            'default is "provision" Optional.'),
+    'fuel_deploy_script': _('path to Bareon executable entry point; '
+                            'default is "bareon-provision" Optional.'),
 }
 COMMON_PROPERTIES = OTHER_PROPERTIES
 
@@ -119,7 +119,7 @@ def _parse_driver_info(node):
                  'driver_info:\n%s') % '\n'.join(error_msgs))
         raise exception.InvalidParameterValue(msg)
 
-    d_info['script'] = info.get('fuel_deploy_script', 'provision')
+    d_info['script'] = info.get('fuel_deploy_script', 'bareon-provision')
 
     return d_info
 
diff --git a/setup.cfg b/setup.cfg
index 923a8f4..3b492c2 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -14,15 +14,14 @@ packages =
 
 [entry_points]
 console_scripts =
-    # TODO(kozhukalov): rename entry point
-    provision = bareon.cmd.agent:provision
-    fa_partition = bareon.cmd.agent:partition
-    fa_configdrive = bareon.cmd.agent:configdrive
-    fa_copyimage = bareon.cmd.agent:copyimage
-    fa_bootloader = bareon.cmd.agent:bootloader
-    fa_build_image = bareon.cmd.agent:build_image
-    fa_ironic_callback = bareon.cmd.ironic_callback:main
-    fa_mkbootstrap = bareon.cmd.agent:mkbootstrap
+    bareon-provision = bareon.cmd.agent:provision
+    bareon-partition = bareon.cmd.agent:partition
+    bareon-configdrive = bareon.cmd.agent:configdrive
+    bareon-copyimage = bareon.cmd.agent:copyimage
+    bareon-bootloader = bareon.cmd.agent:bootloader
+    bareon-build-image = bareon.cmd.agent:build_image
+    bareon-ironic-callback = bareon.cmd.ironic_callback:main
+    bareon-mkbootstrap = bareon.cmd.agent:mkbootstrap
 
 bareon.drivers =
     nailgun = bareon.drivers.nailgun:Nailgun