diff --git a/erpnext/regional/doctype/uae_vat_setting/__init__.py b/erpnext/regional/doctype/uae_vat_settings/__init__.py
similarity index 100%
rename from erpnext/regional/doctype/uae_vat_setting/__init__.py
rename to erpnext/regional/doctype/uae_vat_settings/__init__.py
diff --git a/erpnext/regional/doctype/uae_vat_setting/test_uae_vat_setting.py b/erpnext/regional/doctype/uae_vat_settings/test_uae_vat_settings.py
similarity index 80%
rename from erpnext/regional/doctype/uae_vat_setting/test_uae_vat_setting.py
rename to erpnext/regional/doctype/uae_vat_settings/test_uae_vat_settings.py
index a5f151dc73..b88439f9b8 100644
--- a/erpnext/regional/doctype/uae_vat_setting/test_uae_vat_setting.py
+++ b/erpnext/regional/doctype/uae_vat_settings/test_uae_vat_settings.py
@@ -6,5 +6,5 @@ from __future__ import unicode_literals
 # import frappe
 import unittest
 
-class TestUAEVATSetting(unittest.TestCase):
+class TestUAEVATSettings(unittest.TestCase):
 	pass
diff --git a/erpnext/regional/doctype/uae_vat_setting/uae_vat_setting.js b/erpnext/regional/doctype/uae_vat_settings/uae_vat_settings.js
similarity index 80%
rename from erpnext/regional/doctype/uae_vat_setting/uae_vat_setting.js
rename to erpnext/regional/doctype/uae_vat_settings/uae_vat_settings.js
index f910e1f662..07a93010b5 100644
--- a/erpnext/regional/doctype/uae_vat_setting/uae_vat_setting.js
+++ b/erpnext/regional/doctype/uae_vat_settings/uae_vat_settings.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('UAE VAT Setting', {
+frappe.ui.form.on('UAE VAT Settings', {
 	// refresh: function(frm) {
 
 	// }
diff --git a/erpnext/regional/doctype/uae_vat_setting/uae_vat_setting.json b/erpnext/regional/doctype/uae_vat_settings/uae_vat_settings.json
similarity index 84%
rename from erpnext/regional/doctype/uae_vat_setting/uae_vat_setting.json
rename to erpnext/regional/doctype/uae_vat_settings/uae_vat_settings.json
index e2e2ab8245..ce2c1d4e14 100644
--- a/erpnext/regional/doctype/uae_vat_setting/uae_vat_setting.json
+++ b/erpnext/regional/doctype/uae_vat_settings/uae_vat_settings.json
@@ -7,7 +7,7 @@
  "engine": "InnoDB",
  "field_order": [
   "company",
-  "uae_vat_account"
+  "uae_vat_accounts"
  ],
  "fields": [
   {
@@ -20,19 +20,19 @@
    "unique": 1
   },
   {
-   "fieldname": "uae_vat_account",
+   "fieldname": "uae_vat_accounts",
    "fieldtype": "Table",
-   "label": "UAE VAT Account",
+   "label": "UAE VAT Accounts",
    "options": "UAE VAT Account",
    "reqd": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2020-09-28 12:19:11.493138",
+ "modified": "2020-09-30 20:08:18.764798",
  "modified_by": "Administrator",
  "module": "Regional",
- "name": "UAE VAT Setting",
+ "name": "UAE VAT Settings",
  "owner": "Administrator",
  "permissions": [
   {
diff --git a/erpnext/regional/doctype/uae_vat_setting/uae_vat_setting.py b/erpnext/regional/doctype/uae_vat_settings/uae_vat_settings.py
similarity index 88%
rename from erpnext/regional/doctype/uae_vat_setting/uae_vat_setting.py
rename to erpnext/regional/doctype/uae_vat_settings/uae_vat_settings.py
index 9549de9466..20dc604510 100644
--- a/erpnext/regional/doctype/uae_vat_setting/uae_vat_setting.py
+++ b/erpnext/regional/doctype/uae_vat_settings/uae_vat_settings.py
@@ -6,5 +6,5 @@ from __future__ import unicode_literals
 # import frappe
 from frappe.model.document import Document
 
-class UAEVATSetting(Document):
+class UAEVATSettings(Document):
 	pass
diff --git a/erpnext/regional/united_arab_emirates/setup.py b/erpnext/regional/united_arab_emirates/setup.py
index 70030c736c..0de42120c4 100644
--- a/erpnext/regional/united_arab_emirates/setup.py
+++ b/erpnext/regional/united_arab_emirates/setup.py
@@ -145,7 +145,7 @@ def add_custom_roles_for_reports():
 
 def add_permissions():
 	"""Add Permissions for UAE VAT Settings and UAE VAT Account."""
-	for doctype in ('UAE VAT Setting', 'UAE VAT Account'):
+	for doctype in ('UAE VAT Settings', 'UAE VAT Account'):
 		add_permission(doctype, 'All', 0)
 		for role in ('Accounts Manager', 'Accounts User', 'System Manager'):
 			add_permission(doctype, role, 0)
diff --git a/erpnext/regional/united_arab_emirates/utils.py b/erpnext/regional/united_arab_emirates/utils.py
index f75efd1aae..5a8c3c47fb 100644
--- a/erpnext/regional/united_arab_emirates/utils.py
+++ b/erpnext/regional/united_arab_emirates/utils.py
@@ -52,7 +52,7 @@ def get_tax_accounts(company):
 		)
 
 	if not tax_accounts_list and not frappe.flags.in_test:
-		frappe.throw(_(f'Please set Vat Accounts for Company: "{company}" in UAE VAT Setting'))
+		frappe.throw(_(f'Please set Vat Accounts for Company: "{company}" in UAE VAT Settings'))
 	for d in tax_accounts_list:
 		for key, name in d.items():
 			tax_accounts_dict[name] = name