diff --git a/filefield.module b/filefield.module
index 5da2dac98b830bcd58e242ee2618a1eacfdb5dbc..e0cc0a1c9004737804303369eea46b0083f1073a 100644
--- a/filefield.module
+++ b/filefield.module
@@ -101,7 +101,7 @@ function filefield_theme() {
     ),
 
 
-    'filefield_formatter_filefield_default' => array(
+    'filefield_formatter_default' => array(
       'arguments' => array('element' => NULL),
       'file' => 'filefield_formatter.inc',
     ),
@@ -371,7 +371,7 @@ function filefield_widget_info() {
  */
 function filefield_field_formatter_info() {
   return array(
-    'filefield_default' => array(
+    'default' => array(
       'label' => t('Generic files'),
       'suitability callback' => TRUE,
       'field types' => array('filefield','image'),
diff --git a/filefield_formatter.inc b/filefield_formatter.inc
index 431e3b046ce623efe3fe1d9411346e352b7857e7..c02d560911ac724baa159d91545ddb585489e064 100644
--- a/filefield_formatter.inc
+++ b/filefield_formatter.inc
@@ -13,7 +13,7 @@
 /**
  * Theme function for the 'default' filefield formatter.
  */
-function theme_filefield_formatter_filefield_default($element) {
+function theme_filefield_formatter_default($element) {
   $file = $element['#item'];
   $field = content_fields($element['#field_name']);
   $output = theme('filefield_item', $file, $field);