diff --git a/pmexpense/pmexpense.views.inc b/pmexpense/pmexpense.views.inc
index 3eab584..20742e1 100644
--- a/pmexpense/pmexpense.views.inc
+++ b/pmexpense/pmexpense.views.inc
@@ -17,7 +17,7 @@ function pmexpense_views_data() {
     'help' => t('Expense -> Organization'),
     'relationship' => array(
       'base' => 'node',
-      'field' => 'nid',
+      'base field' => 'nid',
       'handler' => 'views_handler_relationship',
       'label' => t('Expense -> Organization'),
     ),
@@ -45,7 +45,7 @@ function pmexpense_views_data() {
     'help' => t('Expense -> Project'),
     'relationship' => array(
       'base' => 'node',
-      'field' => 'nid',
+      'base field' => 'nid',
       'handler' => 'views_handler_relationship',
       'label' => t('Expense -> Project'),
     ),
@@ -73,7 +73,7 @@ function pmexpense_views_data() {
     'help' => t('Expense -> Task'),
     'relationship' => array(
       'base' => 'node',
-      'field' => 'nid',
+      'base field' => 'nid',
       'handler' => 'views_handler_relationship',
       'label' => t('Expense -> Task'),
     ),
@@ -118,7 +118,7 @@ function pmexpense_views_data() {
     'help' => t('Expense -> Ticket'),
     'relationship' => array(
       'base' => 'node',
-      'field' => 'nid',
+      'base field' => 'nid',
       'handler' => 'views_handler_relationship',
       'label' => t('Expense -> Ticket'),
     ),
@@ -146,7 +146,7 @@ function pmexpense_views_data() {
     'help' => t('Expense -> Provider'),
     'relationship' => array(
       'base' => 'node',
-      'field' => 'nid',
+      'base field' => 'nid',
       'handler' => 'views_handler_relationship',
       'label' => t('Expense -> Provider'),
     ),
@@ -284,4 +284,3 @@ function pmexpense_date_api_fields($field) {
 function pmexpense_date_api_tables() {
   return array('pmexpense');
 }
-
diff --git a/pminvoice/pminvoice.views.inc b/pminvoice/pminvoice.views.inc
index 914d62e..7a405b0 100644
--- a/pminvoice/pminvoice.views.inc
+++ b/pminvoice/pminvoice.views.inc
@@ -52,7 +52,7 @@ function pminvoice_views_data() {
     'help' => t('Invoice -> Organization'),
     'relationship' => array(
       'base' => 'node',
-      'field' => 'nid',
+      'base field' => 'nid',
       'handler' => 'views_handler_relationship',
       'label' => t('Invoice -> Organization'),
     ),
@@ -80,7 +80,7 @@ function pminvoice_views_data() {
     'help' => t('Invoice -> Project'),
     'relationship' => array(
       'base' => 'node',
-      'field' => 'nid',
+      'base field' => 'nid',
       'handler' => 'views_handler_relationship',
       'label' => t('Invoice -> Project'),
     ),
@@ -276,7 +276,7 @@ function pminvoice_views_data() {
     'help' => t('Invoiceitem -> Invoice'),
     'relationship' => array(
       'base' => 'node',
-      'field' => 'nid',
+      'base field' => 'nid',
       'handler' => 'views_handler_relationship',
       'label' => t('Invoiceitem -> Invoice'),
     ),
diff --git a/pmnote/pmnote.views.inc b/pmnote/pmnote.views.inc
index 390b21e..5db0a29 100644
--- a/pmnote/pmnote.views.inc
+++ b/pmnote/pmnote.views.inc
@@ -17,7 +17,7 @@ function pmnote_views_data() {
     'help' => t('Note -> Organization'),
     'relationship' => array(
       'base' => 'node',
-      'field' => 'nid',
+      'base field' => 'nid',
       'handler' => 'views_handler_relationship',
       'label' => t('Note -> Organization'),
     ),
@@ -45,7 +45,7 @@ function pmnote_views_data() {
     'help' => t('Note -> Project'),
     'relationship' => array(
       'base' => 'node',
-      'field' => 'nid',
+      'base field' => 'nid',
       'handler' => 'views_handler_relationship',
       'label' => t('Note -> Project'),
     ),
@@ -73,7 +73,7 @@ function pmnote_views_data() {
     'help' => t('Note -> Task'),
     'relationship' => array(
       'base' => 'node',
-      'field' => 'nid',
+      'base field' => 'nid',
       'handler' => 'views_handler_relationship',
       'label' => t('Note -> Task'),
     ),
diff --git a/pmorganization/pmorganization.views.inc b/pmorganization/pmorganization.views.inc
index a4dbf37..7b5c00a 100644
--- a/pmorganization/pmorganization.views.inc
+++ b/pmorganization/pmorganization.views.inc
@@ -12,40 +12,6 @@ function pmorganization_views_data() {
     ),
   );
 
-  $data['pmorganization']['prefix'] = array(
-    'title' => t('Prefix'),
-    'help' => t('Project Management Organization Prefix'),
-    'field' => array(
-      'click sortable' => TRUE,
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort',
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_string',
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument_string',
-    ),
-  );
-
-  $data['pmorganization']['fullname'] = array(
-    'title' => t('Fullname'),
-    'help' => t('Project Management Organization Fullname'),
-    'field' => array(
-      'click sortable' => TRUE,
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort',
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_string',
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument_string',
-    ),
-  );
-
   $data['pmorganization']['country'] = array(
     'title' => t('Country'),
     'help' => t('Project Management Organization Country'),
diff --git a/pmperson/pmperson.views.inc b/pmperson/pmperson.views.inc
index a46e73d..290cb63 100644
--- a/pmperson/pmperson.views.inc
+++ b/pmperson/pmperson.views.inc
@@ -17,7 +17,7 @@ function pmperson_views_data() {
     'help' => t('Person -> Organization'),
     'relationship' => array(
       'base' => 'node',
-      'field' => 'nid',
+      'base field' => 'nid',
       'handler' => 'views_handler_relationship',
       'label' => t('Person -> Organization'),
     ),
@@ -130,7 +130,7 @@ function pmperson_views_data() {
     'help' => t('Project Management Person -> Drupal User'),
     'relationship' => array(
       'base' => 'users',
-      'field' => 'uid',
+      'base field' => 'uid',
       'handler' => 'views_handler_relationship',
       'label' => t('Person -> User'),
     ),
diff --git a/pmproject/pmproject.views.inc b/pmproject/pmproject.views.inc
index 3790f72..f395291 100644
--- a/pmproject/pmproject.views.inc
+++ b/pmproject/pmproject.views.inc
@@ -18,7 +18,7 @@ function pmproject_views_data() {
     'help' => t('Project -> Organization'),
     'relationship' => array(
       'base' => 'node',
-      'field' => 'nid',
+      'base field' => 'nid',
       'handler' => 'views_handler_relationship',
       'label' => t('Project -> Organization'),
     ),
@@ -215,7 +215,7 @@ function pmproject_views_data() {
     'help' => t('Project -> Manager'),
     'relationship' => array(
       'base' => 'node',
-      'field' => 'nid',
+      'base field' => 'nid',
       'handler' => 'views_handler_relationship',
       'label' => t('Project -> Manager'),
     ),
@@ -243,7 +243,7 @@ function pmproject_views_data() {
     'help' => t('Project -> Assigned'),
     'relationship' => array(
       'base' => 'node',
-      'field' => 'nid',
+      'base field' => 'nid',
       'handler' => 'views_handler_relationship',
       'label' => t('Project -> Assigned'),
     ),
diff --git a/pmtask/pmtask.views.inc b/pmtask/pmtask.views.inc
index 1ec54ad..399dd72 100644
--- a/pmtask/pmtask.views.inc
+++ b/pmtask/pmtask.views.inc
@@ -34,7 +34,7 @@ function pmtask_views_data() {
     'help' => t('Task -> Organization'),
     'relationship' => array(
       'base' => 'node',
-      'field' => 'nid',
+      'base field' => 'nid',
       'handler' => 'views_handler_relationship',
       'label' => t('Task -> Organization'),
     ),
@@ -62,7 +62,7 @@ function pmtask_views_data() {
     'help' => t('Task -> Project'),
     'relationship' => array(
       'base' => 'node',
-      'field' => 'nid',
+      'base field' => 'nid',
       'handler' => 'views_handler_relationship',
       'label' => t('Task -> Project'),
     ),
@@ -90,7 +90,7 @@ function pmtask_views_data() {
     'help' => t('Task -> Parent Task'),
     'relationship' => array(
       'base' => 'node',
-      'field' => 'nid',
+      'base field' => 'nid',
       'handler' => 'views_handler_relationship',
       'label' => t('Task -> Parent Task'),
     ),
@@ -287,7 +287,7 @@ function pmtask_views_data() {
     'help' => t('Task -> Assigned'),
     'relationship' => array(
       'base' => 'node',
-      'field' => 'nid',
+      'base field' => 'nid',
       'handler' => 'views_handler_relationship',
       'label' => t('Task -> Assigned'),
     ),
diff --git a/pmteam/pmteam.views.inc b/pmteam/pmteam.views.inc
index 5c447d4..9692b9b 100644
--- a/pmteam/pmteam.views.inc
+++ b/pmteam/pmteam.views.inc
@@ -35,7 +35,7 @@ function pmteam_views_data() {
     ),
     'relationship' => array(
       'base' => 'node',
-      'field' => 'nid',
+      'base field' => 'nid',
       'handler' => 'views_handler_relationship',
       'label' => t('Member -> Node'),
     ),
diff --git a/pmticket/pmticket.views.inc b/pmticket/pmticket.views.inc
index f68d946..5fe20d5 100644
--- a/pmticket/pmticket.views.inc
+++ b/pmticket/pmticket.views.inc
@@ -17,7 +17,7 @@ function pmticket_views_data() {
     'help' => t('Ticket -> Organization'),
     'relationship' => array(
       'base' => 'node',
-      'field' => 'nid',
+      'base field' => 'nid',
       'handler' => 'views_handler_relationship',
       'label' => t('Ticket -> Organization'),
     ),
@@ -45,7 +45,7 @@ function pmticket_views_data() {
     'help' => t('Ticket -> Project'),
     'relationship' => array(
       'base' => 'node',
-      'field' => 'nid',
+      'base field' => 'nid',
       'handler' => 'views_handler_relationship',
       'label' => t('Ticket -> Project'),
     ),
@@ -73,7 +73,7 @@ function pmticket_views_data() {
     'help' => t('Ticket -> Task'),
     'relationship' => array(
       'base' => 'node',
-      'field' => 'nid',
+      'base field' => 'nid',
       'handler' => 'views_handler_relationship',
       'label' => t('Ticket -> Task'),
     ),
@@ -216,7 +216,7 @@ function pmticket_views_data() {
     'help' => t('Ticket -> Assigned'),
     'relationship' => array(
       'base' => 'node',
-      'field' => 'nid',
+      'base field' => 'nid',
       'handler' => 'views_handler_relationship',
       'label' => t('Ticket -> Assigned'),
     ),
diff --git a/pmtimetracking/pmtimetracking.views.inc b/pmtimetracking/pmtimetracking.views.inc
index 566a21f..2dcb09e 100644
--- a/pmtimetracking/pmtimetracking.views.inc
+++ b/pmtimetracking/pmtimetracking.views.inc
@@ -17,7 +17,7 @@ function pmtimetracking_views_data() {
     'help' => t('Timetracking -> Organization'),
     'relationship' => array(
       'base' => 'node',
-      'field' => 'nid',
+      'base field' => 'nid',
       'handler' => 'views_handler_relationship',
       'label' => t('Timetracking -> Organization'),
     ),
@@ -45,7 +45,7 @@ function pmtimetracking_views_data() {
     'help' => t('Timetracking -> Project'),
     'relationship' => array(
       'base' => 'node',
-      'field' => 'nid',
+      'base field' => 'nid',
       'handler' => 'views_handler_relationship',
       'label' => t('Timetracking -> Project'),
     ),
@@ -73,7 +73,7 @@ function pmtimetracking_views_data() {
     'help' => t('Timetracking -> Task'),
     'relationship' => array(
       'base' => 'node',
-      'field' => 'nid',
+      'base field' => 'nid',
       'handler' => 'views_handler_relationship',
       'label' => t('Timetracking -> Task'),
     ),
@@ -118,7 +118,7 @@ function pmtimetracking_views_data() {
     'help' => t('Timetracking -> Ticket'),
     'relationship' => array(
       'base' => 'node',
-      'field' => 'nid',
+      'base field' => 'nid',
       'handler' => 'views_handler_relationship',
       'label' => t('Timetracking -> Ticket'),
     ),