diff --git a/fieldservice_sale/__manifest__.py b/fieldservice_sale/__manifest__.py
index 94b8f9007c..1659be6b22 100644
--- a/fieldservice_sale/__manifest__.py
+++ b/fieldservice_sale/__manifest__.py
@@ -10,10 +10,10 @@
     "depends": ["fieldservice", "sale_management", "fieldservice_account"],
     "data": [
         "security/ir.model.access.csv",
-        "views/fsm_branch.xml",
         "views/fsm_location.xml",
         "views/fsm_order.xml",
         "views/product_template.xml",
+        "views/res_branch.xml",
         "views/sale_order.xml",
         "views/res_config_settings.xml",
     ],
diff --git a/fieldservice_sale/models/__init__.py b/fieldservice_sale/models/__init__.py
index fda80ebcfa..dfe9d6412e 100644
--- a/fieldservice_sale/models/__init__.py
+++ b/fieldservice_sale/models/__init__.py
@@ -2,10 +2,10 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from . import (
-    fsm_branch,
     fsm_location,
     fsm_order,
     product_template,
+    res_branch,
     sale_order_line,
     sale_order,
 )
diff --git a/fieldservice_sale/models/fsm_location.py b/fieldservice_sale/models/fsm_location.py
index eb1d302ae0..be5cb6f85f 100644
--- a/fieldservice_sale/models/fsm_location.py
+++ b/fieldservice_sale/models/fsm_location.py
@@ -6,4 +6,4 @@
 class FSMLocation(models.Model):
     _inherit = "fsm.location"
 
-    sales_territory_id = fields.Many2one("fsm.territory", string="Sales Territory")
+    sales_territory_id = fields.Many2one("res.territory", string="Sales Territory")
diff --git a/fieldservice_sale/models/fsm_branch.py b/fieldservice_sale/models/res_branch.py
similarity index 84%
rename from fieldservice_sale/models/fsm_branch.py
rename to fieldservice_sale/models/res_branch.py
index a8fadfee49..e9a601932e 100644
--- a/fieldservice_sale/models/fsm_branch.py
+++ b/fieldservice_sale/models/res_branch.py
@@ -3,8 +3,8 @@
 from odoo import fields, models
 
 
-class FSMBranch(models.Model):
-    _inherit = "fsm.branch"
+class ResBranch(models.Model):
+    _inherit = "res.branch"
 
     pricelist_id = fields.Many2one(
         "product.pricelist",
diff --git a/fieldservice_sale/readme/CONTRIBUTORS.rst b/fieldservice_sale/readme/CONTRIBUTORS.rst
index 44ba2fbfcb..674036d84b 100644
--- a/fieldservice_sale/readme/CONTRIBUTORS.rst
+++ b/fieldservice_sale/readme/CONTRIBUTORS.rst
@@ -3,6 +3,7 @@
   * Steve Campbell <scampbell@opensourceintegrators.com>
   * Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
   * Wolfgang Hall <whall@opensourceintegrators.com>
+  * Raphael Lee <rlee@opensourceintegrators.com>
 
 * Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
 * Brian McMaster <brian@mcmpest.com>
diff --git a/fieldservice_sale/views/fsm_branch.xml b/fieldservice_sale/views/fsm_branch.xml
deleted file mode 100644
index 6f46faa6a1..0000000000
--- a/fieldservice_sale/views/fsm_branch.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<odoo>
-    <record id="fsm_branch_form_view_pricelist" model="ir.ui.view">
-        <field name="name">fsm.branch.form.pricelist</field>
-        <field name="model">fsm.branch</field>
-        <field name="inherit_id" ref="fieldservice.fsm_branch_form_view" />
-        <field name="arch" type="xml">
-            <field name="partner_id" position="after">
-                <field name="pricelist_id" groups="product.group_sale_pricelist" />
-            </field>
-        </field>
-    </record>
-</odoo>
diff --git a/fieldservice_sale/views/res_branch.xml b/fieldservice_sale/views/res_branch.xml
new file mode 100644
index 0000000000..9629a57a15
--- /dev/null
+++ b/fieldservice_sale/views/res_branch.xml
@@ -0,0 +1,12 @@
+<odoo>
+    <record id="res_branch_form_view_pricelist" model="ir.ui.view">
+        <field name="name">res.branch.form.pricelist</field>
+        <field name="model">res.branch</field>
+        <field name="inherit_id" ref="base_territory.res_branch_form_view" />
+        <field name="arch" type="xml">
+            <field name="partner_id" position="after">
+                <field name="pricelist_id" groups="product.group_sale_pricelist" />
+            </field>
+        </field>
+    </record>
+</odoo>
diff --git a/fieldservice_sale/views/res_config_settings.xml b/fieldservice_sale/views/res_config_settings.xml
index 61ebb9c951..7d57014d73 100644
--- a/fieldservice_sale/views/res_config_settings.xml
+++ b/fieldservice_sale/views/res_config_settings.xml
@@ -3,9 +3,6 @@
         <field name="group_fsm_template" eval="1" />
     </record>
     <function model="res.config.settings" name="execute">
-        <!-- ids = -->
         <value eval="[ref('fieldservice_sale.res_config_settings_fsm_template')]" />
-        <!-- context = -->
-        <value eval="{}" />
     </function>
 </odoo>