diff --git a/beets/autotag/__init__.py b/beets/autotag/__init__.py
index eb3dae519..7487477e5 100644
--- a/beets/autotag/__init__.py
+++ b/beets/autotag/__init__.py
@@ -34,7 +34,7 @@ log = logging.getLogger('beets')
 
 def apply_item_metadata(item, track_info):
     """Set an item's metadata from its matched TrackInfo object.
-    """    
+    """
     item.artist = track_info.artist
     item.artist_sort = track_info.artist_sort
     item.artist_credit = track_info.artist_credit
@@ -157,5 +157,5 @@ def apply_metadata(album_info, mapping):
             item.composer = track_info.composer
         if track_info.arranger is not None:
             item.arranger = track_info.arranger
-        
-        item.alt_track_no = track_info.alt_track_no
\ No newline at end of file
+
+        item.track_alt = track_info.track_alt
\ No newline at end of file
diff --git a/beets/autotag/hooks.py b/beets/autotag/hooks.py
index a9a35e635..3c403fcf4 100644
--- a/beets/autotag/hooks.py
+++ b/beets/autotag/hooks.py
@@ -145,6 +145,7 @@ class TrackInfo(object):
     - ``lyricist``: individual track lyricist name
     - ``composer``: individual track composer name
     - ``arranger`: individual track arranger name
+    - ``track_alt``: alternative track number (tape, vinyl, etc.)
 
     Only ``title`` and ``track_id`` are required. The rest of the fields
     may be None. The indices ``index``, ``medium``, and ``medium_index``
@@ -154,8 +155,8 @@ class TrackInfo(object):
                  length=None, index=None, medium=None, medium_index=None,
                  medium_total=None, artist_sort=None, disctitle=None,
                  artist_credit=None, data_source=None, data_url=None,
-                 media=None, lyricist=None, composer=None, arranger=None, 
-                 alt_track_no=None):
+                 media=None, lyricist=None, composer=None, arranger=None,
+                 track_alt=None):
         self.title = title
         self.track_id = track_id
         self.artist = artist
@@ -174,7 +175,7 @@ class TrackInfo(object):
         self.lyricist = lyricist
         self.composer = composer
         self.arranger = arranger
-        self.alt_track_no = alt_track_no
+        self.track_alt = track_alt
 
     # As above, work around a bug in python-musicbrainz-ngs.
     def decode(self, codec='utf-8'):
diff --git a/beets/autotag/mb.py b/beets/autotag/mb.py
index fc3b1926c..a0d4dc33a 100644
--- a/beets/autotag/mb.py
+++ b/beets/autotag/mb.py
@@ -256,8 +256,8 @@ def album_info(release):
         all_tracks = medium['track-list']
         if 'pregap' in medium:
             all_tracks.insert(0, medium['pregap'])
-        
-        for track in all_tracks:            
+
+        for track in all_tracks:
             # Basic information from the recording.
             index += 1
             ti = track_info(
@@ -269,7 +269,7 @@ def album_info(release):
             )
             ti.disctitle = disctitle
             ti.media = format
-            ti.alt_track_no = track['number']
+            ti.track_alt = track['number']
 
             # Prefer track data, where present, over recording data.
             if track.get('title'):
diff --git a/beets/library.py b/beets/library.py
index d9ffd38fd..99a84cee6 100644
--- a/beets/library.py
+++ b/beets/library.py
@@ -322,7 +322,7 @@ class LibModel(dbcore.Model):
         funcs.update(plugins.template_funcs())
         return funcs
 
-    def store(self, fields=None):        
+    def store(self, fields=None):
         super(LibModel, self).store(fields)
         plugins.send('database_change', lib=self._db, model=self)
 
@@ -423,10 +423,10 @@ class Item(LibModel):
         'month':                types.PaddedInt(2),
         'day':                  types.PaddedInt(2),
         'track':                types.PaddedInt(2),
-        'alt_track_no':         types.STRING,
+        'track_alt':            types.STRING,
         'tracktotal':           types.PaddedInt(2),
         'disc':                 types.PaddedInt(2),
-        'disctotal':            types.PaddedInt(2),        
+        'disctotal':            types.PaddedInt(2),
         'lyrics':               types.STRING,
         'comments':             types.STRING,
         'bpm':                  types.INTEGER,
@@ -457,7 +457,7 @@ class Item(LibModel):
         'original_year':        types.PaddedInt(4),
         'original_month':       types.PaddedInt(2),
         'original_day':         types.PaddedInt(2),
-        'initial_key':          MusicalKey(),        
+        'initial_key':          MusicalKey(),
 
         'length':      DurationType(),
         'bitrate':     types.ScaledInt(1000, u'kbps'),
diff --git a/beetsplug/discogs.py b/beetsplug/discogs.py
index 905358024..3b3f5f201 100644
--- a/beetsplug/discogs.py
+++ b/beetsplug/discogs.py
@@ -314,9 +314,9 @@ class DiscogsPlugin(BeetsPlugin):
             # Only real tracks have `position`. Otherwise, it's an index track.
             if track['position']:
                 index += 1
-                ti = self.get_track_info(track, index)
-                ti.alt_track_no = track['position']
-                tracks.append(ti)
+                track_info = self.get_track_info(track, index)
+                track_info.track_alt = track['position']
+                tracks.append(track_info)
             else:
                 index_tracks[index + 1] = track['title']