--- ./twitter_username.module	2012-10-13 07:56:54.000000000 -0300
+++ ./new_twitter_username.module	2013-01-07 15:23:15.000000000 -0200
@@ -150,11 +150,11 @@
  */
 function twitter_username_field_formatter_info() {
   return array(
-    'default' => array(
+    'twitter_username_default' => array(
       'label' => t("Twitter username, as plain text"),
       'field types' => array('twitter_username'),
     ),
-    'link' => array(
+    'twitter_username_link' => array(
       'label' => t("Twitter username, as link"),
       'field types' => array('twitter_username'),
     ),
@@ -178,21 +180,21 @@
  */
 function twitter_username_theme() {
   return array(
-    'twitter_username_formatter_default' => array(
+    'twitter_username_formatter_twitter_username_default' => array(
       'variables' => array('element' => NULL),
     ),
-    'twitter_username_formatter_link' => array(
+    'twitter_username_formatter_twitter_username_link' => array(
       'variables' => array('element' => NULL),
     ),
   );
 }
 
-function theme_twitter_username_formatter_default($vars) {
+function theme_twitter_username_formatter_twitter_username_default($vars) {
   $twitter_username = check_plain($vars['element']['twitter_username']);
   return "@" . $twitter_username;
 }
 
-function theme_twitter_username_formatter_link($vars) {
+function theme_twitter_username_formatter_twitter_username_link($vars) {
   $twitter_username = check_plain($vars['element']['twitter_username']);
   return l("@" . $twitter_username, 'http://twitter.com/' . $twitter_username);
 }