3 files changed, 6 insertions, 6 deletions
diff --git a/mediagoblin/media_types/ascii/models.py b/mediagoblin/media_types/ascii/models.py
index 324794b9..03907339 100644
--- a/mediagoblin/media_types/ascii/models.py
+++ b/mediagoblin/media_types/ascii/models.py
@@ -23,11 +23,11 @@ from sqlalchemy import (
 
 
 class AsciiData(Base):
-    __tablename__ = "ascii_data"
+    __tablename__ = "ascii__mediadata"
 
     id = Column(Integer, primary_key=True)
     media_entry = Column(
-        Integer, ForeignKey('media_entries.id'), nullable=False)
+        Integer, ForeignKey('core__media_entries.id'), nullable=False)
 
 
 DATA_MODEL = AsciiData
diff --git a/mediagoblin/media_types/image/models.py b/mediagoblin/media_types/image/models.py
index 88ccc84e..f333cbb8 100644
--- a/mediagoblin/media_types/image/models.py
+++ b/mediagoblin/media_types/image/models.py
@@ -5,10 +5,10 @@ from sqlalchemy import (
 
 
 class ImageData(Base):
-    __tablename__ = "image_data"
+    __tablename__ = "image__mediadata"
 
     # The primary key *and* reference to the main media_entry
-    media_entry = Column(Integer, ForeignKey('media_entries.id'),
+    media_entry = Column(Integer, ForeignKey('core__media_entries.id'),
         primary_key=True)
     width = Column(Integer)
     height = Column(Integer)
diff --git a/mediagoblin/media_types/video/models.py b/mediagoblin/media_types/video/models.py
index 709d7910..0d064f5f 100644
--- a/mediagoblin/media_types/video/models.py
+++ b/mediagoblin/media_types/video/models.py
@@ -22,10 +22,10 @@ from sqlalchemy import (
 
 
 class VideoData(Base):
-    __tablename__ = "video_data"
+    __tablename__ = "video__mediadata"
 
     # The primary key *and* reference to the main media_entry
-    media_entry = Column(Integer, ForeignKey('media_entries.id'),
+    media_entry = Column(Integer, ForeignKey('core__media_entries.id'),
         primary_key=True)
     width = Column(SmallInteger)
     height = Column(SmallInteger)