Refactored: renamed Drupal files and functions due to former unknown nam...

...ing conventions