--- fieldreference.original.module	2008-05-13 12:30:20.000000000 +0200
+++ fieldreference.module	2008-05-13 13:18:17.000000000 +0200
@@ -41,13 +41,13 @@ function fieldreference_field_settings($
 function _fieldreference_get_fields() {
   $fields_list = array();
   $result = db_query('SELECT
-    	nt.type_name, nfi.field_name, nt.label AS type_label, nfi.label AS field_label
+    	nt.type, nfi.field_name, nt.name, nfi.label AS field_label
     FROM
-      {node_type} AS nt INNER JOIN {node_field_instance} AS nfi ON nt.type_name = nfi.type_name
+      {node_type} AS nt INNER JOIN {node_field_instance} AS nfi ON nt.type = nfi.type_name
     ORDER BY
-    	nt.label, nfi.label');
+    	nt.name, nfi.label');
   while ($obj = db_fetch_object($result)) {
-    $fields_list[$obj->type_name .':'. $obj->field_name] = $obj->type_label .':'. $obj->field_label;
+    $fields_list[$obj->type .':'. $obj->field_name] = $obj->name .':'. $obj->field_label;
   }
   return $fields_list;
 }