diff --git a/media_gallery.fields.inc b/media_gallery.fields.inc
index f172915..d9eb9e2 100644
--- a/media_gallery.fields.inc
+++ b/media_gallery.fields.inc
@@ -13,7 +13,7 @@ function media_gallery_field_formatter_info() {
   return array(
     'media_gallery' => array(
       'label' => t('Gallery media'),
-      'field types' => array('media'),
+      'field types' => array('file'),
       'settings' => array('file_view_mode' => 'media_gallery_thumbnail'),
     ),
   );
diff --git a/media_gallery.info b/media_gallery.info
index c7b045c..c21ef79 100644
--- a/media_gallery.info
+++ b/media_gallery.info
@@ -5,7 +5,7 @@ package = Media
 
 dependencies[] = list
 dependencies[] = number
-dependencies[] = media (<1.99)
+dependencies[] = media
 dependencies[] = taxonomy
 dependencies[] = multiform
 
diff --git a/media_gallery.install b/media_gallery.install
index a633d63..a3f6d57 100644
--- a/media_gallery.install
+++ b/media_gallery.install
@@ -183,7 +183,7 @@ function _media_gallery_controlled_fields() {
       'field_name' => 'media_gallery_media',
       'cardinality' => FIELD_CARDINALITY_UNLIMITED,
       'locked' => TRUE,
-      'type' => 'media',
+      'type' => 'file',
     ),
     // The gallery description.
     'media_gallery_description' => array(
diff --git a/media_gallery.module b/media_gallery.module
index 3cfd909..5ca64e3 100644
--- a/media_gallery.module
+++ b/media_gallery.module
@@ -849,10 +849,10 @@ function media_gallery_form($node, $form_state) {
  * Implements hook_form_alter().
  */
 function media_gallery_form_alter(&$form, &$form_state, $form_id) {
-  if (strpos($form_id, 'media_edit') === 0) {
+  if (strpos($form_id, 'file_entity_edit') === 0) {
     // Act on both the regular and multiform versions of the edit form.
-    if ($form_id === 'media_edit' || preg_match('/^media_edit_[0-9]+$/', $form_id)) {
-      // Prepopulate the media_edit form with our best guess at the image title.
+   if ($form_id === 'file_entity_edit' || preg_match('/^file_entity_edit_[0-9]+$/', $form_id)) {
+      // Prepopulate the file_edit form with our best guess at the image title.
       if (!empty($form['media_title']) && empty($form['media_title'][LANGUAGE_NONE][0]['value']['#default_value'])) {
         $fid = $form['fid']['#value'];
         $file = file_load($fid);
@@ -975,7 +975,7 @@ function media_gallery_form_media_gallery_node_form_alter(&$form, &$form_state)
 /**
  * Implements hook_form_FORM_ID_alter().
  */
-function media_gallery_form_media_edit_alter(&$form, &$form_state) {
+function media_gallery_form_file_entity_edit_alter(&$form, &$form_state) {
   // Adjust the media edit form when it is shown within a gallery context.
   if (isset($form_state['media_gallery']['gallery'])) {
     // Remove the Delete button, since media entities can't be deleted when they
@@ -992,9 +992,9 @@ function media_gallery_form_media_edit_alter(&$form, &$form_state) {
     // Make sure to add this for the form-level submit handlers and also for the
     // button-level submit handlers of the "Save" button, in case those are
     // being used.
-    $form['#submit'][] = 'media_gallery_media_edit_submit';
+    $form['#submit'][] = 'media_gallery_file_entity_edit_submit';
     if (isset($form['actions']['submit']['#submit'])) {
-      $form['actions']['submit']['#submit'][] = 'media_gallery_media_edit_submit';
+      $form['actions']['submit']['#submit'][] = 'media_gallery_file_entity_edit_submit';
     }
   }
   // On the media gallery multiedit page, add a "Remove" checkbox to each item.
@@ -1055,7 +1055,7 @@ function media_gallery_multiedit_remove_item($form, &$form_state) {
  *
  * @see media_gallery_form_media_edit_alter()
  */
-function media_gallery_media_edit_submit($form, &$form_state) {
+function media_gallery_file_entity_edit_submit($form, &$form_state) {
   $form_state['redirect'] = 'media-gallery/detail/' .  $form_state['media_gallery']['gallery']->nid . '/' . $form_state['values']['fid'];
 }