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..1b0b369 100644
--- a/media_gallery.module
+++ b/media_gallery.module
@@ -129,8 +129,8 @@ function media_gallery_menu() {
     'title' => 'Download',
     'page callback' => 'media_download',
     'page arguments'  => array(1),
-    'access callback' => 'media_access',
-    'access arguments' => array('view'),
+    'access callback' => 'file_entity_access',
+    'access arguments' => array('view', 1),
     'type' => MENU_CALLBACK,
     'file' => 'media.pages.inc',
   );
@@ -322,8 +322,9 @@ function media_gallery_view($node, $view_mode) {
   // time building the render structure for items that won't be shown.
   if ($view_mode == 'teaser') {
     if (!empty($node->media_gallery_media[LANGUAGE_NONE])) {
-      if (media_access('view')) {
-        $first_item = array_shift($node->media_gallery_media[LANGUAGE_NONE]);
+      $first_item = array_shift($node->media_gallery_media[LANGUAGE_NONE]);
+      $file = file_load($first_item['fid']);
+      if (file_entity_access('view', $file)) {
         $node->media_gallery_media[LANGUAGE_NONE] = array($first_item);
       }
       else {
@@ -334,7 +335,9 @@ function media_gallery_view($node, $view_mode) {
   // For the full display, implement pagination.
   elseif ($view_mode == 'full' || $view_mode == 'media_gallery_block') {
     $full = $view_mode == 'full' ? TRUE : FALSE;
-    if (!empty($node->media_gallery_media) && media_access('view')) {
+    $first_item = $node->media_gallery_media[LANGUAGE_NONE][0];
+    $file = file_load($first_item['fid']);
+    if (!empty($node->media_gallery_media) && file_entity_access('view', $file)) {
       $media = $node->media_gallery_media[LANGUAGE_NONE];
     }
     else {
@@ -597,13 +600,14 @@ function media_gallery_block_info() {
  */
 function media_gallery_block_view($delta = '') {
   $node = node_load($delta);
+  $file = file_load($node->media_gallery_media[LANGUAGE_NONE][0]['fid']);
   if (empty($node->media_gallery_expose_block[LANGUAGE_NONE][0]['value'])) {
     // Bail out now if the node doesn't exist or if it is configured not to
     // display a block.
     $block['subject'] = NULL;
     $block['content'] = '';
   }
-  elseif (empty($node->media_gallery_media_original) || !media_access('view')) {
+  elseif (empty($node->media_gallery_media_original) || !file_entity_access('view', $file)) {
     // Bail out now if there won't be any media items to show.
     $block['subject'] = check_plain($node->title);
     $block['content'] = t('No content available.');
@@ -1077,7 +1081,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),
   );
 
@@ -1488,7 +1492,9 @@ function media_gallery_edit_access($node) {
  * galleries.
  */
 function media_gallery_multiedit_access($node) {
-  if (media_gallery_edit_access($node) && media_access('edit')) {
+  $media_items = field_get_items('node', $node, 'media_gallery_media');
+  $file = file_load($media_items[0]['fid']);
+  if (media_gallery_edit_access($node) && file_entity_access('edit', $file)) {
     $media_items = field_get_items('node', $node, 'media_gallery_media');
     if ($media_items !== FALSE && count($media_items) > 0) {
       return TRUE;
@@ -1509,7 +1515,7 @@ function media_gallery_multiedit_access($node) {
  */
 function media_gallery_view_item_access($node, $file) {
   // Only grant access if the user can view the gallery and the provided media.
-  return media_gallery_view_access($node) && media_access('view')
+  return media_gallery_view_access($node) && file_entity_access('view', $file)
     && in_array($file->fid, media_gallery_get_file_ids($node));
 }
 
@@ -1527,7 +1533,7 @@ function media_gallery_view_item_access($node, $file) {
 function media_gallery_edit_item_access($node, $file) {
   // Only grant access if the user can edit the provided media
   // and the media is part of the gallery.
-  return media_access('edit')
+  return file_entity_access('edit', $file)
     && in_array($file->fid, media_gallery_get_file_ids($node));
 }