Rename functions as per Drupal Coding Standards