diff --git a/datamodels/2.x/authent-external/zh.dict.authent-external.php b/datamodels/2.x/authent-external/zh_cn.dict.authent-external.php
similarity index 100%
rename from datamodels/2.x/authent-external/zh.dict.authent-external.php
rename to datamodels/2.x/authent-external/zh_cn.dict.authent-external.php
diff --git a/datamodels/2.x/authent-ldap/zh.dict.authent-ldap.php b/datamodels/2.x/authent-ldap/zh_cn.dict.authent-ldap.php
similarity index 100%
rename from datamodels/2.x/authent-ldap/zh.dict.authent-ldap.php
rename to datamodels/2.x/authent-ldap/zh_cn.dict.authent-ldap.php
diff --git a/datamodels/2.x/authent-local/zh.dict.authent-local.php b/datamodels/2.x/authent-local/zh_cn.dict.authent-local.php
similarity index 100%
rename from datamodels/2.x/authent-local/zh.dict.authent-local.php
rename to datamodels/2.x/authent-local/zh_cn.dict.authent-local.php
diff --git a/datamodels/2.x/itop-attachments/zh.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/zh_cn.dict.itop-attachments.php
similarity index 100%
rename from datamodels/2.x/itop-attachments/zh.dict.itop-attachments.php
rename to datamodels/2.x/itop-attachments/zh_cn.dict.itop-attachments.php
diff --git a/datamodels/2.x/itop-backup/zh.dict.itop-backup.php b/datamodels/2.x/itop-backup/zh_cn.dict.itop-backup.php
similarity index 100%
rename from datamodels/2.x/itop-backup/zh.dict.itop-backup.php
rename to datamodels/2.x/itop-backup/zh_cn.dict.itop-backup.php
diff --git a/datamodels/2.x/itop-change-mgmt-itil/zh.dict.itop-change-mgmt-itil.php b/datamodels/2.x/itop-change-mgmt-itil/zh_cn.dict.itop-change-mgmt-itil.php
similarity index 100%
rename from datamodels/2.x/itop-change-mgmt-itil/zh.dict.itop-change-mgmt-itil.php
rename to datamodels/2.x/itop-change-mgmt-itil/zh_cn.dict.itop-change-mgmt-itil.php
diff --git a/datamodels/2.x/itop-change-mgmt/zh.dict.itop-change-mgmt.php b/datamodels/2.x/itop-change-mgmt/zh_cn.dict.itop-change-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-change-mgmt/zh.dict.itop-change-mgmt.php
rename to datamodels/2.x/itop-change-mgmt/zh_cn.dict.itop-change-mgmt.php
diff --git a/datamodels/2.x/itop-config-mgmt/zh.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/zh_cn.dict.itop-config-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/zh.dict.itop-config-mgmt.php
rename to datamodels/2.x/itop-config-mgmt/zh_cn.dict.itop-config-mgmt.php
diff --git a/datamodels/2.x/itop-config/zh.dict.itop-config.php b/datamodels/2.x/itop-config/zh_cn.dict.itop-config.php
similarity index 100%
rename from datamodels/2.x/itop-config/zh.dict.itop-config.php
rename to datamodels/2.x/itop-config/zh_cn.dict.itop-config.php
diff --git a/datamodels/2.x/itop-datacenter-mgmt/zh.dict.itop-datacenter-mgmt.php b/datamodels/2.x/itop-datacenter-mgmt/zh_cn.dict.itop-datacenter-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-datacenter-mgmt/zh.dict.itop-datacenter-mgmt.php
rename to datamodels/2.x/itop-datacenter-mgmt/zh_cn.dict.itop-datacenter-mgmt.php
diff --git a/datamodels/2.x/itop-hub-connector/zh.dict.itop-hub-connector.php b/datamodels/2.x/itop-hub-connector/zh_cn.dict.itop-hub-connector.php
similarity index 100%
rename from datamodels/2.x/itop-hub-connector/zh.dict.itop-hub-connector.php
rename to datamodels/2.x/itop-hub-connector/zh_cn.dict.itop-hub-connector.php
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/zh.dict.itop-incident-mgmt-itil.php b/datamodels/2.x/itop-incident-mgmt-itil/zh_cn.dict.itop-incident-mgmt-itil.php
similarity index 100%
rename from datamodels/2.x/itop-incident-mgmt-itil/zh.dict.itop-incident-mgmt-itil.php
rename to datamodels/2.x/itop-incident-mgmt-itil/zh_cn.dict.itop-incident-mgmt-itil.php
diff --git a/datamodels/2.x/itop-knownerror-mgmt/zh.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/zh_cn.dict.itop-knownerror-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-knownerror-mgmt/zh.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-mgmt/zh_cn.dict.itop-knownerror-mgmt.php
diff --git a/datamodels/2.x/itop-portal-base/zh.dict.itop-portal-base.php b/datamodels/2.x/itop-portal-base/zh_cn.dict.itop-portal-base.php
similarity index 100%
rename from datamodels/2.x/itop-portal-base/zh.dict.itop-portal-base.php
rename to datamodels/2.x/itop-portal-base/zh_cn.dict.itop-portal-base.php
diff --git a/datamodels/2.x/itop-problem-mgmt/zh.dict.itop-problem-mgmt.php b/datamodels/2.x/itop-problem-mgmt/zh_cn.dict.itop-problem-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-problem-mgmt/zh.dict.itop-problem-mgmt.php
rename to datamodels/2.x/itop-problem-mgmt/zh_cn.dict.itop-problem-mgmt.php
diff --git a/datamodels/2.x/itop-request-mgmt-itil/zh.dict.itop-request-mgmt-itil.php b/datamodels/2.x/itop-request-mgmt-itil/zh_cn.dict.itop-request-mgmt-itil.php
similarity index 100%
rename from datamodels/2.x/itop-request-mgmt-itil/zh.dict.itop-request-mgmt-itil.php
rename to datamodels/2.x/itop-request-mgmt-itil/zh_cn.dict.itop-request-mgmt-itil.php
diff --git a/datamodels/2.x/itop-request-mgmt/zh.dict.itop-request-mgmt.php b/datamodels/2.x/itop-request-mgmt/zh_cn.dict.itop-request-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-request-mgmt/zh.dict.itop-request-mgmt.php
rename to datamodels/2.x/itop-request-mgmt/zh_cn.dict.itop-request-mgmt.php
diff --git a/datamodels/2.x/itop-service-mgmt-provider/zh.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/zh_cn.dict.itop-service-mgmt-provider.php
similarity index 100%
rename from datamodels/2.x/itop-service-mgmt-provider/zh.dict.itop-service-mgmt-provider.php
rename to datamodels/2.x/itop-service-mgmt-provider/zh_cn.dict.itop-service-mgmt-provider.php
diff --git a/datamodels/2.x/itop-service-mgmt/zh.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/zh_cn.dict.itop-service-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-service-mgmt/zh.dict.itop-service-mgmt.php
rename to datamodels/2.x/itop-service-mgmt/zh_cn.dict.itop-service-mgmt.php
diff --git a/datamodels/2.x/itop-tickets/zh.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/zh_cn.dict.itop-tickets.php
similarity index 100%
rename from datamodels/2.x/itop-tickets/zh.dict.itop-tickets.php
rename to datamodels/2.x/itop-tickets/zh_cn.dict.itop-tickets.php
diff --git a/datamodels/2.x/itop-welcome-itil/zh.dict.itop-welcome-itil.php b/datamodels/2.x/itop-welcome-itil/zh_cn.dict.itop-welcome-itil.php
similarity index 100%
rename from datamodels/2.x/itop-welcome-itil/zh.dict.itop-welcome-itil.php
rename to datamodels/2.x/itop-welcome-itil/zh_cn.dict.itop-welcome-itil.php
diff --git a/dictionaries/zh.dictionary.itop.core.php b/dictionaries/zh_cn.dictionary.itop.core.php
similarity index 100%
rename from dictionaries/zh.dictionary.itop.core.php
rename to dictionaries/zh_cn.dictionary.itop.core.php
diff --git a/dictionaries/zh.dictionary.itop.ui.php b/dictionaries/zh_cn.dictionary.itop.ui.php
similarity index 100%
rename from dictionaries/zh.dictionary.itop.ui.php
rename to dictionaries/zh_cn.dictionary.itop.ui.php