Rename and optimize

Rename the projects with the same name in the Drupal Sandbox Project
and optimize various pieces of code