diff --git a/formio/__manifest__.py b/formio/__manifest__.py
index cb4444cd..d8fd9f31 100644
--- a/formio/__manifest__.py
+++ b/formio/__manifest__.py
@@ -2,8 +2,8 @@
 # See LICENSE file for full licensing details.
 
 {
-    'name': 'Form.io',
-    'summary': 'Build, deploy and store web forms with the "Form.io" Form Builder',
+    'name': 'Forms',
+    'summary': 'Build, deploy and store Forms',
     'version': '7.9',
     'license': 'LGPL-3',
     'author': 'Nova Code',
@@ -57,29 +57,9 @@
         'static/description/banner.png',
     ],
     'description': """
-Form.io
-=======
-
-Build, deploy and store web forms in with the "Form.io" Form Builder.
-
-http://form.io
-
-The "Form.io" GUI/renderer and data are hosted on-premise (your hosting). So you're under control.
-
-After installation of the module you can start right away.
-No extra setup and requirements are needed.
-
-Form Builder
-------------
-
-* Form Building starts in Odoo, by create a record and open the Form Builder right away.
-* All Form data (schema) is stored on-premise, in your Odoo database
-
-Form
-----
-
-* Users can create, edit and fill-in Forms.
-* Forms are stored in the Odoo database.
+Forms
+=====
 
+Build, deploy and Forms.
 """
 }
diff --git a/formio/data/ir_cron_data.xml b/formio/data/ir_cron_data.xml
index 71d473c2..09f21d0a 100644
--- a/formio/data/ir_cron_data.xml
+++ b/formio/data/ir_cron_data.xml
@@ -5,7 +5,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html) -->
 <odoo>
     <data noupdate="1">
         <record id="ir_cron_formio_version_github_tag_check_and_register" forcecreate="True" model="ir.cron">
-            <field name="name">Form.io: Check and register new Versions (GitHub tags)</field>
+            <field name="name">Forms: Check and register new Versions (GitHub tags)</field>
             <field name="model_id" ref="model_formio_version_github_tag"/>
             <field name="state">code</field>
             <field name="code">model.check_and_register_available_versions()</field>
diff --git a/formio/data/mail_template_data.xml b/formio/data/mail_template_data.xml
index f67279e5..23c6a07b 100644
--- a/formio/data/mail_template_data.xml
+++ b/formio/data/mail_template_data.xml
@@ -6,7 +6,7 @@ See LICENSE file for full copyright and licensing details.
 <odoo>
     <data>
         <record id="mail_invitation_internal_user" model="mail.template">
-            <field name="name">Form.io: Invitation internal user</field>
+            <field name="name">Forms: Invitation internal user</field>
             <field name="model_id" ref="formio.model_formio_form"/>
             <field name="auto_delete" eval="False"/>
             <field name="email_from">"${user.company_id.name|safe}" &lt;${(user.company_id.email or user.email)|safe}&gt;</field>
@@ -33,7 +33,7 @@ See LICENSE file for full copyright and licensing details.
         </record>
 
         <record id="mail_invitation_portal_user" model="mail.template">
-            <field name="name">Form.io: Invitation portal user</field>
+            <field name="name">Forms: Invitation portal user</field>
             <field name="model_id" ref="formio.model_formio_form"/>
             <field name="auto_delete" eval="False"/>
             <field name="email_from">"${user.company_id.name|safe}" &lt;${(user.company_id.email or user.email)|safe}&gt;</field>
diff --git a/formio/security/formio_security.xml b/formio/security/formio_security.xml
index 8c5657b3..bd71469e 100644
--- a/formio/security/formio_security.xml
+++ b/formio/security/formio_security.xml
@@ -5,8 +5,8 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html) -->
 <odoo>
     <data>
         <record id="module_category_formio" model="ir.module.category">
-            <field name="name">Form.io</field>
-            <field name="description">Form.io</field>
+            <field name="name">Forms</field>
+            <field name="description">Forms</field>
             <field name="sequence">10</field>
         </record>
 
diff --git a/formio/static/src/js/builder/app.js b/formio/static/src/js/builder/app.js
index 620d4369..6cdad5ca 100644
--- a/formio/static/src/js/builder/app.js
+++ b/formio/static/src/js/builder/app.js
@@ -52,12 +52,12 @@ class App extends Component {
                 return;
             }
             else {
-                console.log('[Form.io] Saving Builder...');
+                console.log('[Forms] Saving Builder...');
                 $.jsonRpc.request(self.saveUrl, 'call', {
                     'builder_id': self.builderId,
                     'schema': res
                 }).then(function() {
-                    console.log('[Form.io] Builder sucessfully saved.');
+                    console.log('[Forms] Builder sucessfully saved.');
                 });
             }
         });
diff --git a/formio/views/formio_builder_views.xml b/formio/views/formio_builder_views.xml
index a3817a31..9f44a6cd 100644
--- a/formio/views/formio_builder_views.xml
+++ b/formio/views/formio_builder_views.xml
@@ -33,7 +33,7 @@ See LICENSE file for full licensing details. -->
         <field name="name">formio.builder.formio</field>
         <field name="model">formio.builder</field>
         <field name="arch" type="xml">
-            <formio_builder string="Form.io">
+            <formio_builder string="Form.io Builder">
                 <field name="id"/>
                 <field name="name"/>
                 <field name="title"/>
@@ -91,7 +91,7 @@ See LICENSE file for full licensing details. -->
                     <notebook>
                         <page string="General" name="settings">
                             <group name="settings">
-                                <group name="formio_settings" string="Form.io">
+                                <group name="formio_settings" string="Form.io JavaScript (JS)">
                                     <field name="formio_version_id" attrs="{'readonly': [('state', '!=', 'DRAFT')]}"/>
                                     <field name="wizard" groups="formio.group_formio_admin" attrs="{'readonly': [('state', '!=', 'DRAFT')]}"/>
                                     <field name="view_as_html" groups="formio.group_formio_admin"/>
diff --git a/formio/views/formio_form_views.xml b/formio/views/formio_form_views.xml
index 258ab3d7..10e81990 100644
--- a/formio/views/formio_form_views.xml
+++ b/formio/views/formio_form_views.xml
@@ -116,7 +116,7 @@ See LICENSE file for full licensing details. -->
         <field name="name">formio.form.formio</field>
         <field name="model">formio.form</field>
         <field name="arch" type="xml">
-            <formio_form string="Form.io">
+            <formio_form string="Form.io Form">
                 <field name="id"/>
                 <field name="uuid"/>
                 <field name="name"/>
diff --git a/formio/views/formio_menu.xml b/formio/views/formio_menu.xml
index 2cf3127f..b0a73b8a 100644
--- a/formio/views/formio_menu.xml
+++ b/formio/views/formio_menu.xml
@@ -5,7 +5,7 @@ See LICENSE file for full licensing details. -->
 <odoo>
     <menuitem
         id="menu_formio_root"
-        name="Form.io"
+        name="Forms"
         sequence="2"
         web_icon="formio,static/description/icon.png"
         groups="base.group_user"/>
diff --git a/formio/views/formio_portal_templates.xml b/formio/views/formio_portal_templates.xml
index 6d70b4ef..e07f715f 100644
--- a/formio/views/formio_portal_templates.xml
+++ b/formio/views/formio_portal_templates.xml
@@ -115,7 +115,7 @@ See LICENSE file for full licensing details. -->
         </t>
     </template>
 
-    <template id="portal_my_formio_edit" name="Form.io Form" priority="40">
+    <template id="portal_my_formio_edit" name="Portal Form" priority="40">
         <t t-call="portal.portal_layout">
             <div t-attf-class="formio_form_container mt16 {{ form.state }}">
                 <div class="formio_form_iframe_container">
diff --git a/formio/views/res_config_settings_views.xml b/formio/views/res_config_settings_views.xml
index 60e343c0..58b63bdc 100644
--- a/formio/views/res_config_settings_views.xml
+++ b/formio/views/res_config_settings_views.xml
@@ -10,7 +10,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html) -->
         <field name="arch" type="xml">
             <xpath expr="//div[hasclass('settings')]" position="inside">
                 <div class="app_settings_block" data-string="Form.io" data-key="formio">
-                    <h2>Form.io client/library version importer</h2>
+                    <h2>Form.io JS/library version importer</h2>
                     <div class="row mt16 o_settings_container formio_version">
                         <div class="col-12 col-md-6 o_setting_box">
                             <div class="o_setting_left_pane"/>
@@ -84,7 +84,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html) -->
                     <div class="row mt16 o_settings_container formio_default_builder_js_options">
                         <div class="text-muted">
                             Select a default Form Builder JavaScript Options Template.<br/>
-                            It's contents, the Form Builder JavaScript Options, shall be show below.
+                            It's contents, the Form Builder JavaScript Options, shall be shown below.
                         </div>
                         
                         <div class="col-12 col-md-12 o_setting_box">
diff --git a/formio_component_recaptcha_button/__manifest__.py b/formio_component_recaptcha_button/__manifest__.py
index a9e63707..686a80d0 100644
--- a/formio_component_recaptcha_button/__manifest__.py
+++ b/formio_component_recaptcha_button/__manifest__.py
@@ -2,7 +2,7 @@
 # See LICENSE file for full licensing details.
 
 {
-    'name': 'Form.io reCAPTCHA Button Component',
+    'name': 'Forms reCAPTCHA Button Component',
     'summary': 'Drag & drop a reCAPTCHA component with (server)verification on a Form.',
     'version': '1.0',
     'license': 'LGPL-3',
@@ -23,8 +23,8 @@
         'static/description/banner.png',
     ],
     'description': """
-Form.io reCAPTCHA Button Component
-==================================
+Forms reCAPTCHA Button Component
+================================
 
 """
 }
diff --git a/formio_component_recaptcha_button/views/formio_builder_views.xml b/formio_component_recaptcha_button/views/formio_builder_views.xml
index 264d4f13..cf5ed879 100644
--- a/formio_component_recaptcha_button/views/formio_builder_views.xml
+++ b/formio_component_recaptcha_button/views/formio_builder_views.xml
@@ -11,7 +11,7 @@ See LICENSE file for full licensing details. -->
             <xpath expr="//page[@name='formio_components_api']/group[@name='partner']" position="inside">
                     <group string="reCAPTCHA Button" colspan="2">
                         <div colspan="2">
-                            <i class="fa fa-info-circle" title="info"/> Put the Site Key in the API (tab) property, in the Form.io Builder Component: (odoo) reCAPTCHA
+                            <i class="fa fa-info-circle" title="info"/> Put the Site Key in the API (tab) property, in the Form Builder Component: (odoo) reCAPTCHA
                         </div>
                         <div colspan="2">
                             <i class="fa fa-info-circle" title="info"/> Configure in (menu) Technical / System Paramaters: <code>formio_recaptcha_button.site_key</code>, <code>formio_recaptcha_button.secret_key</code>
diff --git a/formio_crm/__manifest__.py b/formio_crm/__manifest__.py
index c6c2c667..a5715083 100644
--- a/formio_crm/__manifest__.py
+++ b/formio_crm/__manifest__.py
@@ -2,8 +2,8 @@
 # See LICENSE file for full licensing details.
 
 {
-    'name': 'Form.io CRM',
-    'summary': 'Form.io webforms on CRM Leads',
+    'name': 'Forms CRM',
+    'summary': 'Formio webforms on CRM Leads',
     'version': '0.2',
     'license': 'LGPL-3',
     'author': 'Nova Code',
@@ -20,9 +20,9 @@
         'static/description/banner.png',
     ],
     'description': """
-Form.io - CRM
-=============
+Forms - CRM
+===========
 
-Build and publish (Form.io) forms for Leads.
+Build and publish (Formio) forms for Leads.
 """
 }
diff --git a/formio_crm/models/crm_lead.py b/formio_crm/models/crm_lead.py
index 6b898458..08f1f33d 100644
--- a/formio_crm/models/crm_lead.py
+++ b/formio_crm/models/crm_lead.py
@@ -7,7 +7,7 @@
 class CrmLead(models.Model):
     _inherit = 'crm.lead'
 
-    formio_forms = fields.One2many('formio.form', 'crm_lead_id', string='Form.io Forms')
+    formio_forms = fields.One2many('formio.form', 'crm_lead_id', string='Forms')
     formio_forms_count = fields.Integer(compute='_compute_formio_forms_count')
     formio_this_model_id = fields.Many2one('ir.model', compute='_compute_formio_this_model_id')
 
diff --git a/formio_data_api/__manifest__.py b/formio_data_api/__manifest__.py
index d8ec4d63..079673ba 100644
--- a/formio_data_api/__manifest__.py
+++ b/formio_data_api/__manifest__.py
@@ -2,8 +2,8 @@
 # See LICENSE file for full licensing details.
 
 {
-    'name': 'Form.io Data API',
-    'summary': 'Python API for Form.io data (builder, form/submission).',
+    'name': 'Forms Data API',
+    'summary': 'Python API for Forms data (builder, form/submission).',
     'version': '0.5',
     'license': 'LGPL-3',
     'author': 'Nova Code',
@@ -20,8 +20,8 @@
         'static/description/banner.png',
     ],
     'description': """
-Form.io Data API
-================
+Forms Data API
+==============
 
 """
 }
diff --git a/formio_partner/__manifest__.py b/formio_partner/__manifest__.py
index 93298fd8..95595bd4 100644
--- a/formio_partner/__manifest__.py
+++ b/formio_partner/__manifest__.py
@@ -2,8 +2,8 @@
 # See LICENSE file for full licensing details.
 
 {
-    'name': 'Form.io Partner',
-    'summary': 'Form.io webforms on Partners',
+    'name': 'Forms Partner',
+    'summary': 'Forms on Partners',
     'version': '1.0',
     'license': 'LGPL-3',
     'author': 'Nova Code',
@@ -21,9 +21,9 @@
         'static/description/banner.png',
     ],
     'description': """
-Form.io - Partners
-==================
+Forms - Partners
+================
 
-Build and publish (Form.io) forms for Partners.
+Build and publish Forms for Partners.
 """
 }
diff --git a/formio_partner/models/partner.py b/formio_partner/models/partner.py
index d1040974..748dca42 100644
--- a/formio_partner/models/partner.py
+++ b/formio_partner/models/partner.py
@@ -7,7 +7,7 @@
 class ResPartner(models.Model):
     _inherit = 'res.partner'
 
-    formio_forms = fields.One2many('formio.form', 'partner_id', string='Form.io Forms')
+    formio_forms = fields.One2many('formio.form', 'partner_id', string='Forms')
     formio_forms_count = fields.Integer(compute='_compute_formio_forms_count')
     formio_this_model_id = fields.Many2one('ir.model', compute='_compute_formio_this_model_id')
 
diff --git a/formio_report_qweb/__manifest__.py b/formio_report_qweb/__manifest__.py
index 2f3ed539..7eee2daa 100644
--- a/formio_report_qweb/__manifest__.py
+++ b/formio_report_qweb/__manifest__.py
@@ -2,7 +2,7 @@
 # See LICENSE file for full licensing details.
 
 {
-    'name': 'Form.io QWeb Reports',
+    'name': 'Forms QWeb Reports',
     'summary': 'Generate (PDF) reports for every Form',
     'version': '0.11',
     'author': 'Nova Code',
diff --git a/formio_report_qweb/report/formio_form_report_views.xml b/formio_report_qweb/report/formio_form_report_views.xml
index 35ca261c..288262c6 100644
--- a/formio_report_qweb/report/formio_form_report_views.xml
+++ b/formio_report_qweb/report/formio_form_report_views.xml
@@ -11,7 +11,7 @@
         report_type="qweb-pdf"
         file="formio_report_qweb.report_formio_form"
         name="formio_report_qweb.report_formio_form"
-        print_report_name="'Form.io Form - %s - %s' % (object.title, object.id)"
+        print_report_name="'Form - %s - %s' % (object.title, object.id)"
         />
     <report
         id="action_report_formio_form_assigned_user"
@@ -20,6 +20,6 @@
         report_type="qweb-pdf"
         file="formio_report_qweb.report_formio_form_assigned_user"
         name="formio_report_qweb.report_formio_form_assigned_user"
-        print_report_name="'Form.io Form - %s - %s' % (object.title, object.id)"
+        print_report_name="'Form - %s - %s' % (object.title, object.id)"
         />
 </odoo>
diff --git a/formio_sale/__manifest__.py b/formio_sale/__manifest__.py
index 6a9bd3e2..ef45ba62 100644
--- a/formio_sale/__manifest__.py
+++ b/formio_sale/__manifest__.py
@@ -2,8 +2,8 @@
 # See LICENSE file for full licensing details.
 
 {
-    'name': 'Form.io Sales',
-    'summary': 'Form.io webforms on Sale Orders/Quotes',
+    'name': 'Forms Sales',
+    'summary': 'Formio webforms on Sale Orders/Quotes',
     'version': '0.4',
     'license': 'LGPL-3',
     'author': 'Nova Code',
@@ -21,9 +21,9 @@
         'static/description/banner.png',
     ],
     'description': """
-Form.io - Sales
-===============
+Forms - Sales
+=============
 
-Build and publish (Form.io) forms for Sale Orders/Quotes.
+Build and publish (Formio) forms for Sale Orders/Quotes.
 """
 }
diff --git a/formio_sale/models/sale.py b/formio_sale/models/sale.py
index 8dc8985e..98ba28be 100644
--- a/formio_sale/models/sale.py
+++ b/formio_sale/models/sale.py
@@ -7,7 +7,7 @@
 class SaleOrder(models.Model):
     _inherit = 'sale.order'
 
-    formio_forms = fields.One2many('formio.form', 'sale_order_id', string='Form.io Forms')
+    formio_forms = fields.One2many('formio.form', 'sale_order_id', string='Forms')
     formio_forms_count = fields.Integer(compute='_compute_formio_forms_count')
     formio_this_model_id = fields.Many2one('ir.model', compute='_compute_formio_this_model_id')
 
diff --git a/website_formio/__manifest__.py b/website_formio/__manifest__.py
index 8a638072..1563df76 100644
--- a/website_formio/__manifest__.py
+++ b/website_formio/__manifest__.py
@@ -2,8 +2,8 @@
 # See LICENSE file for full licensing details.
 
 {
-    'name': 'Form.io Website (Snippet etc)',
-    'summary': 'Form Snippet, Other website integration',
+    'name': 'Forms Website (Snippet etc)',
+    'summary': 'Forms Snippet, Other website integration',
     'version': '1.4',
     'license': 'LGPL-3',
     'author': 'Nova Code',
diff --git a/website_formio/data/website_data.xml b/website_formio/data/website_data.xml
index 93d75c22..ba9fbe10 100644
--- a/website_formio/data/website_data.xml
+++ b/website_formio/data/website_data.xml
@@ -5,11 +5,11 @@ See LICENSE file for full licensing details. -->
 <odoo>
     <data noupdate="1">
         <record id="formio_thankyou" model="ir.ui.view">
-            <field name="name">Form.io: Thank you (form submission)</field>
+            <field name="name">Forms: Thank you (form submission)</field>
             <field name="type">qweb</field>
             <field name="key">website_formio.formio_thankyou</field>
             <field name="arch" type="xml">
-                <t name="Form.io: Thank you (form submission)" t-name="website_formio.formio_thankyou">
+                <t name="Forms: Thank you (form submission)" t-name="website_formio.formio_thankyou">
                     <t t-call="website.layout">
                         <div id="wrap" class="oe_structure oe_empty">
                             <section class="s_text_block pt32 pb0">
diff --git a/website_formio/data/website_formio_demo_data.xml b/website_formio/data/website_formio_demo_data.xml
index b76f4674..ea71b23f 100644
--- a/website_formio/data/website_formio_demo_data.xml
+++ b/website_formio/data/website_formio_demo_data.xml
@@ -6,7 +6,7 @@ See LICENSE file for full licensing details. -->
     <data>
         <record id="formio_builder_demo_website" model="formio.builder">
             <field name="name">website_demo_1</field>
-            <field name="title">Demo - Form.io Website Snippet (public form)</field>
+            <field name="title">Demo - Forms Website Snippet (public form)</field>
             <field name="formio_version_id" ref="formio.version_4_9_26"/>
             <field name="public" eval="True"/>
             <field name="state">CURRENT</field>
diff --git a/website_formio/static/src/js/website_formio_editor.js b/website_formio/static/src/js/website_formio_editor.js
index e380eef8..e3c96583 100644
--- a/website_formio/static/src/js/website_formio_editor.js
+++ b/website_formio/static/src/js/website_formio_editor.js
@@ -10,7 +10,7 @@ odoo.define('website_formio_editor', function (require) {
 
     options.registry.website_formio_editor = options.Class.extend({
         popup_template_id: "editor_new_formio_form_popup",
-        popup_title: _t("Add a Form.io Form"),
+        popup_title: _t("Add a Form"),
 
         select_formio_builder: function (previewMode, value) {
             var self = this;
diff --git a/website_formio/views/website_formio_snippets.xml b/website_formio/views/website_formio_snippets.xml
index 00fb8a69..53605c55 100644
--- a/website_formio/views/website_formio_snippets.xml
+++ b/website_formio/views/website_formio_snippets.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="s_website_formio" name="Form.io Form">
+    <template id="s_website_formio" name="Form">
         <section class="s_website_formio bg-200 pt48 pb24">
             <div class="container">
                 <div class="formio_form_iframe_container">