Word templates have incorrect Entity Type Code when uploaded to new organization

Hi,

I've been developing word templates and a CRM solution with a custom entity used in the templates.

Once everything was build, I've imported the solution and then upload some word templates, however the Associated Entity Type Code shows as another entity.

I would expect that entities have same type code, as is same CRM solution. The solution is unmanaged.

Is there any tip to avoid re-creating template when moving between different environments/organizations?