diff --git a/media_gallery.info b/media_gallery.info
index c7b045c..6d6b751 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 (>1.99)
 dependencies[] = taxonomy
 dependencies[] = multiform
 
diff --git a/media_gallery.install b/media_gallery.install
index a786f58..8e557ec 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(
@@ -851,7 +851,7 @@ function _media_gallery_ensure_field_tags() {
 function _media_gallery_ensure_media_instances() {
   $t = get_t();
   $instances = _media_required_instances();
-  foreach (media_type_get_types() as $bundle => $type) {
+  foreach (file_type_get_enabled_types() as $bundle => $type) {
     foreach ($instances as $instance) {
       $instance_copy = $instance;
       $instance_copy += array(
@@ -988,7 +988,7 @@ function media_gallery_update_7000() {
     field_update_instance( array(
         'field_name' => 'media_description',
         'bundle' => $bundle,
-        'entity_type' => 'media',
+        'entity_type' => 'file',
         'display' => array(
           'default' => array('type' => 'text_default', 'label' => 'above'),
           'media_gallery_thumbnail' => array('type' => 'text_default', 'label' => 'above'),
@@ -1068,14 +1068,14 @@ function media_gallery_update_7001() {
 function media_gallery_update_7002() {
   drupal_load('module', 'field');
   $bundle = 'video';
-  $bundle_settings = field_bundle_settings('media', $bundle);
+  $bundle_settings = field_bundle_settings('file', $bundle);
   $bundle_settings['view_modes']['media_gallery_thumbnail']['custom_settings'] = TRUE;
   $bundle_settings['view_modes']['media_gallery_lightbox']['custom_settings'] = TRUE;
   $bundle_settings['view_modes']['media_gallery_detail']['custom_settings'] = TRUE;
   $bundle_settings['view_modes']['media_gallery_block_thumbnail']['custom_settings'] = TRUE;
   $bundle_settings['view_modes']['media_gallery_collection_thumbnail']['custom_settings'] = TRUE;
-  field_bundle_settings('media', $bundle, $bundle_settings);
-  $instance = field_info_instance('media', 'file', $bundle);
+  field_bundle_settings('file', $bundle, $bundle_settings);
+  $instance = field_info_instance('file', 'file', $bundle);
   $instance['display']['media_gallery_thumbnail'] = array('type' => 'styles_file_media_gallery_thumbnail', 'label' => 'hidden');
   $instance['display']['media_gallery_lightbox'] = array('type' => 'styles_file_media_gallery_large', 'label' => 'hidden');
   $instance['display']['media_gallery_detail'] = array('type' => 'styles_file_media_gallery_large', 'label' => 'hidden');
diff --git a/media_gallery.module b/media_gallery.module
index c017b9e..1fc172a 100644
--- a/media_gallery.module
+++ b/media_gallery.module
@@ -1077,7 +1077,7 @@ function _media_gallery_add_remove_checkbox(&$form, &$form_state, $node) {
   $form['remove'] = array(
     '#type' => 'checkbox',
     '#title' => t('Remove from gallery'),
-    '#description' => t('The original file remains in your <a href="@library">media library</a>.', array('@library' => url('admin/content/media'))),
+    '#description' => t('The original file remains in your <a href="@library">media library</a>.', array('@library' => url('admin/content/file'))),
     '#access' => node_access('update', $node),
   );