diff --git a/application/libraries/Email_messages.php b/application/libraries/Email_messages.php
index 6d927562..73ddf227 100644
--- a/application/libraries/Email_messages.php
+++ b/application/libraries/Email_messages.php
@@ -118,7 +118,7 @@ class Email_messages {
             $appointment_end->setTimezone($appointment_timezone);
         }
 
-        $html = $this->CI->load->view('emails/appointment_details', [
+        $html = $this->CI->load->view('emails/appointment_saved_email', [
             'email_title' => $subject,
             'email_message' => $message,
             'appointment_service' => $service['name'],
@@ -216,7 +216,7 @@ class Email_messages {
             $appointment_start->setTimezone($appointment_timezone);
         }
 
-        $html = $this->CI->load->view('emails/delete_appointment', [
+        $html = $this->CI->load->view('emails/appointment_deleted_email', [
             'appointment_service' => $service['name'],
             'appointment_provider' => $provider['first_name'] . ' ' . $provider['last_name'],
             'appointment_date' => $appointment_start->format($date_format . ' ' . $time_format),
@@ -258,7 +258,7 @@ class Email_messages {
         array $settings
     )
     {
-        $html = $this->CI->load->view('emails/new_password', [
+        $html = $this->CI->load->view('emails/account_recovery_email', [
             'email_title' => lang('new_account_password'),
             'email_message' => str_replace('$password', '<strong>' . $password . '</strong>', lang('new_password_is')),
             'company_name' => $settings['company_name'],
diff --git a/application/views/emails/new_password.php b/application/views/emails/account_recovery_email.php
similarity index 100%
rename from application/views/emails/new_password.php
rename to application/views/emails/account_recovery_email.php
diff --git a/application/views/emails/delete_appointment.php b/application/views/emails/appointment_deleted_email.php
similarity index 100%
rename from application/views/emails/delete_appointment.php
rename to application/views/emails/appointment_deleted_email.php
diff --git a/application/views/emails/appointment_details.php b/application/views/emails/appointment_saved_email.php
similarity index 100%
rename from application/views/emails/appointment_details.php
rename to application/views/emails/appointment_saved_email.php