diff --git a/lib/galaxy/managers/hdas.py b/lib/galaxy/managers/hdas.py
index ffa325bd768..348f406dd2e 100644
--- a/lib/galaxy/managers/hdas.py
+++ b/lib/galaxy/managers/hdas.py
@@ -393,12 +393,10 @@ class HDASerializer(  # datasets._UnflattenedMetadataDatasetAssociationSerialize
         """
         nametags = []
         for tag in hda.tags:
-            if tag.tag.name.startswith('name.'):
-                nametags.append(tag.tag.name[5:])
+            if tag.user_tname.startswith('name.'):
+                nametags.append(tag.user_tname[5:])
         return nametags
 
-        return [tag for tag in hda.tags if tag.tag.name.startswith('name.')]
-
     def serialize_old_display_applications( self, hda, key, trans=None, **context ):
         """
         Return dictionary containing old-style display app urls.