Also fix the references inside the native code.
Merge branch 'lowjoel-fix-2297' into lowjoel-drupal7