metainfo/metainfo.go | 2 +-
 torrent.go           | 2 +-

diff --git a/metainfo/metainfo.go b/metainfo/metainfo.go
index 583cf51e2dc599b52c2c4c80bbfd3d9d73ce2382..0aca2375398fa1390eb822e0a0acabf69127484c 100644
--- a/metainfo/metainfo.go
+++ b/metainfo/metainfo.go
@@ -72,7 +72,7 @@ // Creates a Magnet from a MetaInfo. Optional infohash and parsed info can be provided.
 func (mi *MetaInfo) Magnet(infoHash *Hash, info *Info) (m Magnet) {
 	m.Trackers = append(m.Trackers, mi.UpvertedAnnounceList().DistinctValues()...)
 	if info != nil {
-		m.DisplayName = info.Name
+		m.DisplayName = info.BestName()
 	}
 	if infoHash != nil {
 		m.InfoHash = *infoHash
diff --git a/torrent.go b/torrent.go
index f6be69782d40621632b4b97da248c16a14370729..7e6ec24cc2c8c76ac507e3e3adce34c3a5e14eec 100644
--- a/torrent.go
+++ b/torrent.go
@@ -543,7 +543,7 @@ func (t *Torrent) name() string {
 	t.nameMu.RLock()
 	defer t.nameMu.RUnlock()
 	if t.haveInfo() {
-		return t.info.Name
+		return t.info.BestName()
 	}
 	if t.displayName != "" {
 		return t.displayName