Drupal Changes

Made necessary changes to conform to Drupal's naming requirements for
the module.