diff --git a/pms-l10n-es/README.rst b/pms_l10n_es/README.rst
similarity index 100%
rename from pms-l10n-es/README.rst
rename to pms_l10n_es/README.rst
diff --git a/pms-l10n-es/__init__.py b/pms_l10n_es/__init__.py
similarity index 100%
rename from pms-l10n-es/__init__.py
rename to pms_l10n_es/__init__.py
diff --git a/pms-l10n-es/__manifest__.py b/pms_l10n_es/__manifest__.py
similarity index 74%
rename from pms-l10n-es/__manifest__.py
rename to pms_l10n_es/__manifest__.py
index cb815c739..fe28af852 100644
--- a/pms-l10n-es/__manifest__.py
+++ b/pms_l10n_es/__manifest__.py
@@ -1,10 +1,8 @@
-# Copyright 2013 Nicolas Bessi (Camptocamp SA)
-# Copyright 2014 Agile Business Group (<http://www.agilebg.com>)
-# Copyright 2015 Grupo ESOC (<http://www.grupoesoc.es>)
+# Copyright 2020 CommitSun (<http://www.commitsun.com>)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 {
-    "name": "Adaptation to spanish law",
+    "name": "PMS Spanish Adaptation",
     "version": "14.0.1.0.0",
     "author": "CommitSun, " "Odoo Community Association (OCA)",
     "license": "AGPL-3",
diff --git a/pms-l10n-es/i18n/es.po b/pms_l10n_es/i18n/es.po
similarity index 100%
rename from pms-l10n-es/i18n/es.po
rename to pms_l10n_es/i18n/es.po
diff --git a/pms-l10n-es/models/__init__.py b/pms_l10n_es/models/__init__.py
similarity index 100%
rename from pms-l10n-es/models/__init__.py
rename to pms_l10n_es/models/__init__.py
diff --git a/pms-l10n-es/models/pms_checkin_partner.py b/pms_l10n_es/models/pms_checkin_partner.py
similarity index 100%
rename from pms-l10n-es/models/pms_checkin_partner.py
rename to pms_l10n_es/models/pms_checkin_partner.py
diff --git a/pms-l10n-es/models/res_partner.py b/pms_l10n_es/models/res_partner.py
similarity index 100%
rename from pms-l10n-es/models/res_partner.py
rename to pms_l10n_es/models/res_partner.py
diff --git a/pms-l10n-es/static/description/icon.png b/pms_l10n_es/static/description/icon.png
similarity index 100%
rename from pms-l10n-es/static/description/icon.png
rename to pms_l10n_es/static/description/icon.png
diff --git a/pms-l10n-es/static/description/index.html b/pms_l10n_es/static/description/index.html
similarity index 100%
rename from pms-l10n-es/static/description/index.html
rename to pms_l10n_es/static/description/index.html
diff --git a/pms-l10n-es/tests/__init__.py b/pms_l10n_es/tests/__init__.py
similarity index 100%
rename from pms-l10n-es/tests/__init__.py
rename to pms_l10n_es/tests/__init__.py
diff --git a/pms-l10n-es/tests/test_partner.py b/pms_l10n_es/tests/test_partner.py
similarity index 100%
rename from pms-l10n-es/tests/test_partner.py
rename to pms_l10n_es/tests/test_partner.py
diff --git a/pms-l10n-es/views/pms_checkin_partner_views.xml b/pms_l10n_es/views/pms_checkin_partner_views.xml
similarity index 100%
rename from pms-l10n-es/views/pms_checkin_partner_views.xml
rename to pms_l10n_es/views/pms_checkin_partner_views.xml
diff --git a/pms-l10n-es/views/res_partner_views.xml b/pms_l10n_es/views/res_partner_views.xml
similarity index 100%
rename from pms-l10n-es/views/res_partner_views.xml
rename to pms_l10n_es/views/res_partner_views.xml
diff --git a/setup/pms-l10n-es/odoo/addons/pms-l10n-es b/setup/pms-l10n-es/odoo/addons/pms-l10n-es
deleted file mode 120000
index ebee048ef..000000000
--- a/setup/pms-l10n-es/odoo/addons/pms-l10n-es
+++ /dev/null
@@ -1 +0,0 @@
-../../../../pms-l10n-es
\ No newline at end of file
diff --git a/setup/pms_l10n_es/odoo/addons/pms_l10n_es b/setup/pms_l10n_es/odoo/addons/pms_l10n_es
new file mode 120000
index 000000000..ad9fc48d4
--- /dev/null
+++ b/setup/pms_l10n_es/odoo/addons/pms_l10n_es
@@ -0,0 +1 @@
+../../../../pms_l10n_es
\ No newline at end of file
diff --git a/setup/pms-l10n-es/setup.py b/setup/pms_l10n_es/setup.py
similarity index 100%
rename from setup/pms-l10n-es/setup.py
rename to setup/pms_l10n_es/setup.py