diff --git a/app/lib/utils.py b/app/lib/utils.py
index 5ec8644..934ee4d 100644
--- a/app/lib/utils.py
+++ b/app/lib/utils.py
@@ -130,7 +130,7 @@ def display_record_name(data):
     if record_name == domain_name:
         return '@'
     else:
-        return record_name.replace('.'+domain_name, '')
+        return re.sub('\.{}$'.format(domain_name), '', record_name)
 
 
 def display_master_name(data):
diff --git a/app/views.py b/app/views.py
index d40bd2e..d775189 100644
--- a/app/views.py
+++ b/app/views.py
@@ -917,14 +917,14 @@ def create_template_from_zone():
                 if NEW_SCHEMA:
                     for jr in jrecords:
                         if jr['type'] in app.config['RECORDS_ALLOW_EDIT']:
-                            name = '@' if jr['name'] == domain_name else jr['name'].replace('.'+domain_name, '')
+                            name = '@' if jr['name'] == domain_name else re.sub('\.{}$'.format(domain_name), '', jr['name'])
                             for subrecord in jr['records']:
                                 record = DomainTemplateRecord(name=name, type=jr['type'], status=True if subrecord['disabled'] else False, ttl=jr['ttl'], data=subrecord['content'])
                                 records.append(record)
                 else:
                     for jr in jrecords:
                         if jr['type'] in app.config['RECORDS_ALLOW_EDIT']:
-                            name = '@' if jr['name'] == domain_name else jr['name'].replace('.'+domain_name, '')
+                            name = '@' if jr['name'] == domain_name else re.sub('\.{}$'.format(domain_name), '', jr['name'])
                             record = DomainTemplateRecord(name=name, type=jr['type'], status=True if jr['disabled'] else False, ttl=jr['ttl'], data=jr['content'])
                             records.append(record)