Revert "Revert "Merges ahilles107:CS-4591 and CS-4591 together including changes to the naming convention""

This reverts commit 5b1c2ab07d70a8aed10882f0777baf9fb3a11fdc.

Was a little too fast with previous revert. Only wanted to change EmailService.php not the
other files.