diff --git a/beets/mediafile.py b/beets/mediafile.py
index d002cd12f..5f3cb04da 100644
--- a/beets/mediafile.py
+++ b/beets/mediafile.py
@@ -675,17 +675,17 @@ class MediaFile(object):
                     as_type=str),
                 etc = StorageStyle('musicbrainz_albumtype')
             )
+    albumart = MediaField(
+                mp3 = StorageStyle('APIC', id3_frame_field=u'data'),
+                mp4 = StorageStyle('covr', as_type=str),
+                etc = StorageStyle('picture')
+            )
     albumart_mime = MediaField(
                 mp3 = StorageStyle('APIC', id3_desc=u'Cover',
                                    id3_frame_field=u'mime'),
                 mp4 = None,
                 etc = None
             )
-    albumart_data = MediaField(
-                mp3 = StorageStyle('APIC', id3_frame_field=u'data'),
-                mp4 = StorageStyle('covr', as_type=str),
-                etc = StorageStyle('picture')
-            )
 
     # MusicBrainz IDs.
     mb_trackid = MediaField(
diff --git a/beetsplug/embedcoverart.py b/beetsplug/embedcoverart.py
index d3b59f3a2..4bef70284 100644
--- a/beetsplug/embedcoverart.py
+++ b/beetsplug/embedcoverart.py
@@ -40,7 +40,7 @@ class EmbedCoverArtPlugin(BeetsPlugin):
                     if "mp3" in item.type:
                         f.albumart_mime = mime_type
                     
-                    f.albumart_data = albumart_raw
+                    f.albumart = albumart_raw
                     f.save()
-             else:
+            else:
                 log.error('Sorry, a file of type %s is not allowed as coverart.' % mime_img)