diff --git a/.gitignore b/.gitignore
index 25edbeb5..b4c82f7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+/db/test.sqlite3-journal
 config/application.rb
 config/config.yml
 config/secrets.yml
diff --git a/app/mailers/mailbot.rb b/app/mailers/mailbot.rb
index e8118382..43fb72e6 100644
--- a/app/mailers/mailbot.rb
+++ b/app/mailers/mailbot.rb
@@ -5,7 +5,7 @@ class Mailbot < ActionMailer::Base
     build_email(conference,
                 person.email,
                 conference.email_settings.registration_subject,
-                conference.email_settings.generate_email_on_conf_updates(conference, person, conference.email_settings.registration_email_template))
+                conference.email_settings.generate_email_on_conf_updates(conference, person, conference.email_settings.registration_body))
   end
 
   def acceptance_mail(event)
@@ -14,7 +14,7 @@ class Mailbot < ActionMailer::Base
     build_email(conference,
                 person.email,
                 conference.email_settings.accepted_subject,
-                conference.email_settings.generate_event_mail(event, conference.email_settings.accepted_email_template))
+                conference.email_settings.generate_event_mail(event, conference.email_settings.accepted_body))
   end
 
   def rejection_mail(event)
@@ -23,7 +23,7 @@ class Mailbot < ActionMailer::Base
     build_email(conference,
                 person.email,
                 conference.email_settings.rejected_subject,
-                conference.email_settings.generate_event_mail(event, conference.email_settings.rejected_email_template))
+                conference.email_settings.generate_event_mail(event, conference.email_settings.rejected_body))
   end
 
   def confirm_reminder_mail(event)
@@ -32,7 +32,7 @@ class Mailbot < ActionMailer::Base
     build_email(conference,
                 person.email,
                 conference.email_settings.confirmed_without_registration_subject,
-                conference.email_settings.generate_event_mail(event, conference.email_settings.confirmed_email_template))
+                conference.email_settings.generate_event_mail(event, conference.email_settings.confirmed_without_registration_body))
   end
 
   def conference_date_update_mail(conference)
@@ -40,7 +40,7 @@ class Mailbot < ActionMailer::Base
       build_email(conference,
                   user.email,
                   conference.email_settings.updated_conference_dates_subject,
-                  conference.email_settings.generate_email_on_conf_updates(conference, user, conference.email_settings.updated_conference_dates_template))
+                  conference.email_settings.generate_email_on_conf_updates(conference, user, conference.email_settings.updated_conference_dates_body))
     end
   end
 
@@ -49,7 +49,7 @@ class Mailbot < ActionMailer::Base
       build_email(conference,
                   user.email,
                   conference.email_settings.updated_conference_registration_dates_subject,
-                  conference.email_settings.generate_email_on_conf_updates(conference, user, conference.email_settings.updated_conference_registration_dates_template))
+                  conference.email_settings.generate_email_on_conf_updates(conference, user, conference.email_settings.updated_conference_registration_dates_body))
     end
   end
 
@@ -58,7 +58,7 @@ class Mailbot < ActionMailer::Base
       build_email(conference,
                   user.email,
                   conference.email_settings.venue_update_subject,
-                  conference.email_settings.generate_email_on_conf_updates(conference, user, conference.email_settings.venue_update_template))
+                  conference.email_settings.generate_email_on_conf_updates(conference, user, conference.email_settings.venue_update_body))
     end
   end
 
@@ -67,7 +67,7 @@ class Mailbot < ActionMailer::Base
       build_email(conference,
                   user.email,
                   conference.email_settings.call_for_papers_schedule_public_subject,
-                  conference.email_settings.generate_email_on_conf_updates(conference, user, conference.email_settings.call_for_papers_schedule_public_template))
+                  conference.email_settings.generate_email_on_conf_updates(conference, user, conference.email_settings.call_for_papers_schedule_public_body))
     end
   end
 
@@ -76,7 +76,7 @@ class Mailbot < ActionMailer::Base
       build_email(conference,
                   user.email,
                   conference.email_settings.call_for_papers_dates_updates_subject,
-                  conference.email_settings.generate_email_on_conf_updates(conference, user, conference.email_settings.call_for_papers_dates_updates_template))
+                  conference.email_settings.generate_email_on_conf_updates(conference, user, conference.email_settings.call_for_papers_dates_updates_body))
     end
   end
 
diff --git a/app/models/call_for_paper.rb b/app/models/call_for_paper.rb
index 0d4f6ab1..14bcf771 100644
--- a/app/models/call_for_paper.rb
+++ b/app/models/call_for_paper.rb
@@ -47,7 +47,7 @@ class CallForPaper < ActiveRecord::Base
     && (self.start_date_changed? || self.end_date_changed?)\
     && self.conference.email_settings.send_on_call_for_papers_dates_updates\
     && !self.conference.email_settings.call_for_papers_dates_updates_subject.blank?\
-    && !self.conference.email_settings.call_for_papers_dates_updates_template.blank?
+    && !self.conference.email_settings.call_for_papers_dates_updates_body.blank?
   end
   ##
   # Checks whether cfp dates is updated
@@ -60,7 +60,7 @@ class CallForPaper < ActiveRecord::Base
     && (self.start_date_changed? || self.end_date_changed?)\
     && self.conference.email_settings.send_on_call_for_papers_dates_updates\
     && !self.conference.email_settings.call_for_papers_dates_updates_subject.blank?\
-    && !self.conference.email_settings.call_for_papers_dates_updates_template.blank?
+    && !self.conference.email_settings.call_for_papers_dates_updates_body.blank?
   end
 
   def remaining_days(date = Date.today)
diff --git a/app/models/conference.rb b/app/models/conference.rb
index 3c6f20b2..0b34f00f 100644
--- a/app/models/conference.rb
+++ b/app/models/conference.rb
@@ -572,7 +572,7 @@ class Conference < ActiveRecord::Base
     (self.start_date_changed? || self.end_date_changed?) &&
     self.email_settings.send_on_updated_conference_dates &&
     !self.email_settings.updated_conference_dates_subject.blank? &&
-    self.email_settings.updated_conference_dates_template
+    self.email_settings.updated_conference_dates_body
   end
 
   ##
@@ -586,7 +586,7 @@ class Conference < ActiveRecord::Base
     (registration_period.start_date_changed? || registration_period.end_date_changed?) &&
     email_settings.send_on_updated_conference_registration_dates &&
     !email_settings.updated_conference_registration_dates_subject.blank? &&
-    email_settings.updated_conference_registration_dates_template
+    email_settings.updated_conference_registration_dates_body
   end
 
   private
diff --git a/app/models/email_settings.rb b/app/models/email_settings.rb
index 5642b4da..4339336d 100644
--- a/app/models/email_settings.rb
+++ b/app/models/email_settings.rb
@@ -1,16 +1,13 @@
 class EmailSettings < ActiveRecord::Base
-  attr_accessible :send_on_registration, :send_on_accepted, :send_on_rejected,
-                  :send_on_confirmed_without_registration, :registration_email_template,
-                  :accepted_email_template, :rejected_email_template, :confirmed_email_template,
-                  :registration_subject, :accepted_subject, :rejected_subject,
-                  :confirmed_without_registration_subject,
-                  :send_on_updated_conference_dates, :updated_conference_dates_subject,
-                  :updated_conference_dates_template, :send_on_updated_conference_registration_dates,
-                  :updated_conference_registration_dates_subject, :updated_conference_registration_dates_template,
-                  :send_on_venue_update, :venue_update_subject, :venue_update_template,
-                  :send_on_call_for_papers_dates_updates, :send_on_call_for_papers_schedule_public,
-                  :call_for_papers_schedule_public_subject, :call_for_papers_dates_updates_subject,
-                  :call_for_papers_schedule_public_template, :call_for_papers_dates_updates_template
+  attr_accessible :send_on_registration, :registration_subject, :registration_body,
+                  :send_on_accepted, :accepted_subject, :accepted_body,
+                  :send_on_rejected, :rejected_subject, :rejected_body,
+                  :send_on_confirmed_without_registration, :confirmed_without_registration_subject, :confirmed_without_registration_body,
+                  :send_on_updated_conference_dates, :updated_conference_dates_subject, :updated_conference_dates_body,
+                  :send_on_updated_conference_registration_dates, :updated_conference_registration_dates_subject, :updated_conference_registration_dates_body,
+                  :send_on_venue_update, :venue_update_subject, :venue_update_body,
+                  :send_on_call_for_papers_dates_updates, :call_for_papers_dates_updates_subject, :call_for_papers_dates_updates_body,
+                  :send_on_call_for_papers_schedule_public, :call_for_papers_schedule_public_subject, :call_for_papers_schedule_public_body
 
   def get_values(conference, user, event = nil)
     h = {
diff --git a/app/models/event.rb b/app/models/event.rb
index 7cd75a89..a182550c 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -112,7 +112,7 @@ class Event < ActiveRecord::Base
 
   def process_confirmation
     if conference.email_settings.send_on_confirmed_without_registration? &&
-        conference.email_settings.confirmed_email_template &&
+        conference.email_settings.confirmed_without_registration_body &&
         conference.email_settings.confirmed_without_registration_subject
       if conference.registrations.where(user_id: submitter.id).first.nil?
         Mailbot.delay.confirm_reminder_mail(self)
@@ -122,7 +122,7 @@ class Event < ActiveRecord::Base
 
   def process_acceptance(options)
     if conference.email_settings.send_on_accepted &&
-        conference.email_settings.accepted_email_template &&
+        conference.email_settings.accepted_body &&
         conference.email_settings.accepted_subject &&
         !options[:send_mail].blank?
       Rails.logger.debug 'Sending event acceptance mail'
@@ -132,7 +132,7 @@ class Event < ActiveRecord::Base
 
   def process_rejection(options)
     if conference.email_settings.send_on_rejected &&
-        conference.email_settings.rejected_email_template &&
+        conference.email_settings.rejected_body &&
         conference.email_settings.rejected_subject &&
         !options[:send_mail].blank?
       Rails.logger.debug 'Sending rejected mail'
diff --git a/app/models/venue.rb b/app/models/venue.rb
index 7177bbd7..dfd483c8 100644
--- a/app/models/venue.rb
+++ b/app/models/venue.rb
@@ -36,7 +36,7 @@ class Venue < ActiveRecord::Base
     (!self.name.blank? && !self.street.blank?) &&
     (conference.email_settings.send_on_venue_update &&
     !conference.email_settings.venue_update_subject.blank? &&
-    conference.email_settings.venue_update_template)
+    conference.email_settings.venue_update_body)
   end
 
   # TODO: create a module to be mixed into model to perform same operation
diff --git a/app/views/admin/emails/comment_template.text.erb b/app/views/admin/emails/comment_template.text.erb
index 0ebd8ad4..f32da943 100644
--- a/app/views/admin/emails/comment_template.text.erb
+++ b/app/views/admin/emails/comment_template.text.erb
@@ -7,4 +7,4 @@ User <%= @comment.user.name %> posted a new comment for event <%= @event.title %
 To reply to this comment, please go to <%=  h( admin_conference_event_url(@conference.short_title, @event)) %>
 
 Best wishes,
-<%= @conference.short_title %> Team
+<%= @conference.title %> Team
diff --git a/app/views/admin/emails/index.html.haml b/app/views/admin/emails/index.html.haml
index 9ae321eb..31465179 100644
--- a/app/views/admin/emails/index.html.haml
+++ b/app/views/admin/emails/index.html.haml
@@ -19,68 +19,68 @@
               #onboarding.tab-pane.active{:role => "tabpanel"}
                 = f.input :send_on_registration, label: "Send an email when the user registers for the conference?", :input_html => {"data-name"=>"email_settings_registration_subject", "class"=>"send_on_radio"}
                 = f.input :registration_subject
-                = f.input :registration_email_template, :input_html => { :rows => 10, :cols => 20}
+                = f.input :registration_body, :input_html => { :rows => 10, :cols => 20}
                 %a.btn.btn-link.control_label.load_template{"data-template"=>"Dear {name},\n\nThank you for Registering for the conference {conference}.\nPlease complete your registration by filling out your travel information.\n\nIf you are unable to attend please unregister online:\n{registrationlink}\n\nFeel free to contact us with any questions or concerns.\nWe look forward to see you there.\n\nBest wishes\n\n{conference} Team",
-                "data-name"=>"email_settings_registration_email_template"} Load Template
+                "data-name"=>"email_settings_registration_body"} Load Template
                 %a.btn.btn-link.control_label.template_help_link{"data-name"=>"registration_help"} Show Help
                 = render partial: 'help', locals: {id: 'registration_help', show_event_variables: false}
               #proposal.tab-pane{:role => "tabpanel"}
                 = f.input :send_on_accepted, label: "Send an email when the proposal is accepted?", :input_html => {"data-name"=>"email_settings_accepted_subject", "class"=>"send_on_radio"}
                 = f.input :accepted_subject
-                = f.input :accepted_email_template, :input_html => { :rows => 10, :cols => 20 }
+                = f.input :accepted_body, :input_html => { :rows => 10, :cols => 20 }
                 %a.btn.btn-link.control_label.load_template{"data-template"=>"Dear {name}\n\nWe are very pleased to inform you that your submission {eventtitle} has been accepted for the conference {conference}.\n\nThe public page of your submission can be found at:\n{proposalslink}\nIf you haven´t already registered for {conference}, please do as soon as possible:\n{registrationlink}\n\nFeel free to contact us with any questions or concerns.\n\nWe look forward to seeing you there.\n\nBest wishes\n\n{conference} Team",
-                "data-name"=>"email_settings_accepted_email_template"} Load Template
+                "data-name"=>"email_settings_accepted_body"} Load Template
                 %a.btn.btn-link.control_label.template_help_link{"data-name"=>"accepted_help"} Show Help
                 = render partial: 'help', locals: {id: 'accepted_help', show_event_variables: true}
                 = f.input :send_on_rejected, label: "Send an email when the proposal is rejected?", :input_html => {"data-name"=>"email_settings_rejected_subject", "class"=>"send_on_radio"}
                 = f.input :rejected_subject
-                = f.input :rejected_email_template, :input_html => { :rows => 10, :cols => 20 }
+                = f.input :rejected_body, :input_html => { :rows => 10, :cols => 20 }
                 %a.btn.btn-link.control_label.load_template{"data-template"=>"Dear {name},\n\nThank you for your submission {eventtitle} for the conference {conference}.\nAfter careful consideration we are sorry to inform you that your submissionhas been rejected.\n\n\nBest wishes\n\n{conference} Team",
-                "data-name"=>"email_settings_rejected_email_template"} Load Template
+                "data-name"=>"email_settings_rejected_body"} Load Template
                 %a.btn.btn-link.control_label.template_help_link{"data-name"=>"rejected_help"} Show Help
                 = render partial: 'help', locals: {id: 'rejected_help', show_event_variables: true}
                 = f.input :send_on_confirmed_without_registration, label: "Send an email when a user has a confirmed proposal, but isn't yet registered?", :input_html => {"data-name"=>"email_settings_confirmed_without_registration_subject", "class"=>"send_on_radio"}
                 = f.input :confirmed_without_registration_subject
-                = f.input :confirmed_email_template, :input_html => { :rows => 10, :cols => 20 }
+                = f.input :confirmed_without_registration_body, :input_html => { :rows => 10, :cols => 20 }
                 %a.btn.btn-link.control_label.load_template{"data-template"=>"Dear {name},\n\nThank you for the confirmation of {eventtitle}. Unfortunately you are not registered for the conference {conference}. Please register as soon as possible:\n{registrationlink}\n\nFeel free to contact us with any questions or concerns.\n\nWe look forward to seeing you there.\n\nBest wishes\n\n{conference} Team",
-                "data-name"=>"email_settings_confirmed_email_template"} Load Template
+                "data-name"=>"email_settings_confirmed_without_registration_body"} Load Template
                 %a.btn.btn-link.control_label.template_help_link{"data-name"=>"confirmed_help"} Show Help
                 = render partial: 'help', locals: {id: 'confirmed_help', show_event_variables: true}
               #notifications.tab-pane{:role => "tabpanel"}
                 = f.input :send_on_updated_conference_dates, label: "This is to notify all participants that the conference dates has been changed.", :input_html => {"data-name"=>"email_settings_updated_conference_dates_subject", "class"=>"send_on_radio"}
                 = f.input :updated_conference_dates_subject
-                = f.input :updated_conference_dates_template, :input_html => { :rows => 10, :cols => 20 }
+                = f.input :updated_conference_dates_body, :input_html => { :rows => 10, :cols => 20 }
                 %a.btn.btn-link.control_label.load_template{"data-template"=>"Dear {name},\n\nThe date of {conference} has changed.\n New Dates : {conference_start_date} - {conference_end_date}.\n\nFeel free to contact us with any questions or concerns.\n\nWe look forward to seeing you there.\n\nBest wishes\n\n{conference} Team",
-                "data-name"=>"email_settings_updated_conference_dates_template"} Load Template
+                "data-name"=>"email_settings_updated_conference_dates_body"} Load Template
                 %a.btn.btn-link.control_label.template_help_link{"data-name"=>"updated_dates_help"} Show Help
                 = render partial: 'help', locals: {id: 'updated_dates_help', show_event_variables: false}
                 = f.input :send_on_updated_conference_registration_dates, label: "This is to notify all participants that the conference registration dates has been changed.", :input_html => {"data-name"=>"email_settings_updated_conference_registration_dates_subject", "class"=>"send_on_radio"}
                 = f.input :updated_conference_registration_dates_subject
-                = f.input :updated_conference_registration_dates_template, :input_html => { :rows => 10, :cols => 20 }
+                = f.input :updated_conference_registration_dates_body, :input_html => { :rows => 10, :cols => 20 }
                 %a.btn.btn-link.control_label.load_template{"data-template"=>"Dear {name},\n\nThe registration date of {conference} has changed.\n New Dates : {registration_start_date} - {registration_end_date}.\n\nFeel free to contact us with any questions or concerns.\n\nWe look forward to seeing you there.\n\nBest wishes\n\n{conference} Team",
-                "data-name"=>"email_settings_updated_conference_registration_dates_template"} Load Template
+                "data-name"=>"email_settings_updated_conference_registration_dates_body"} Load Template
                 %a.btn.btn-link.control_label.template_help_link{"data-name"=>"updated_registrations_dates_help"} Show Help
                 = render partial: 'help', locals: {id: 'updated_registrations_dates_help', show_event_variables: false}
                 = f.input :send_on_venue_update, label: 'Send an email on updating the Venue.', :input_html => {"data-name"=>"email_settings_venue_update_subject", "class"=>"send_on_radio"}
                 = f.input :venue_update_subject
-                = f.input :venue_update_template, :input_html => { :rows => 10, :cols => 20 }
+                = f.input :venue_update_body, :input_html => { :rows => 10, :cols => 20 }
                 %a.btn.btn-link.control_label.load_template{"data-template"=>"Dear {name},\n\nThe Conference venue of {conference} has changed. New location is: {venue}.\n Address: {venue_address}.\n\nFeel free to contact us with any questions or concerns.\n\nWe look forward to seeing you there.\n\nBest wishes\n\n{conference} Team",
-                "data-name"=>"email_settings_venue_update_template"} Load Template
+                "data-name"=>"email_settings_venue_update_body"} Load Template
                 %a.btn.btn-link.control_label.template_help_link{"data-name"=>"updated_venue_help"} Show Help
                 = render partial: 'help', locals: {id: 'updated_venue_help', show_event_variables: false}
               #cfp.tab-pane{:role => "tabpanel"}
                 = f.input :send_on_call_for_papers_schedule_public, hint: "This will notify all participants when the dates are updated or when the schedule is made public"
                 = f.input :call_for_papers_schedule_public_subject, hint: "This subject will used whenever dates are updated or when the schedule is made public"
-                = f.input :call_for_papers_schedule_public_template, :input_html => { :rows => 10, :cols => 20 }
+                = f.input :call_for_papers_schedule_public_body, :input_html => { :rows => 10, :cols => 20 }
                 %a.btn.btn-link.control_label.load_template{"data-template"=>"Dear {name},\n\nThe Conference Call for Papers Details of {conference} has changed.The schedule is being made public.\n Link to Schedule {schedule_link} \n\nBest wishes\n\n{conference} Team",
-                "data-name"=>"email_settings_call_for_papers_schedule_public_template"} Load Template
+                "data-name"=>"email_settings_call_for_papers_schedule_public_body"} Load Template
                 %a.btn.btn-link.control_label.template_help_link{"data-name"=>"updated_cfp_help"} Show Help
                 = render partial: 'help', locals: {id: 'updated_cfp_help', show_event_variables: false}
                 = f.input :send_on_call_for_papers_dates_updates, hint: "This will notify all participants when the dates are updated or when the schedule is made public"
                 = f.input :call_for_papers_dates_updates_subject, hint: "This subject will used whenever dates are updated or when the schedule is made public"
-                = f.input :call_for_papers_dates_updates_template, :input_html => { :rows => 10, :cols => 20 }
+                = f.input :call_for_papers_dates_updates_body, :input_html => { :rows => 10, :cols => 20 }
                 %a.btn.btn-link.control_label.load_template{"data-template"=>"Dear {name},\n\nThe Conference Call for Papers Details of {conference} has changed.\nNew Dates : {cfp_start_date} - {cfp_end_date}.\n Link to Schedule {schedule_link} \n\nBest wishes\n\n{conference} Team",
-                "data-name"=>"email_settings_call_for_papers_dates_updates_template"} Load Template
+                "data-name"=>"email_settings_call_for_papers_dates_updates_body"} Load Template
                 %a.btn.btn-link.control_label.template_help_link{"data-name"=>"updated_cfp_help"} Show Help
                 = render partial: 'help', locals: {id: 'updated_cfp_help', show_event_variables: false}
       .row
diff --git a/db/migrate/20151005161518_rename_templates_in_email_settings.rb b/db/migrate/20151005161518_rename_templates_in_email_settings.rb
new file mode 100644
index 00000000..1a420eac
--- /dev/null
+++ b/db/migrate/20151005161518_rename_templates_in_email_settings.rb
@@ -0,0 +1,13 @@
+class RenameTemplatesInEmailSettings < ActiveRecord::Migration
+  def change
+    rename_column :email_settings, :registration_email_template, :registration_body
+    rename_column :email_settings, :accepted_email_template, :accepted_body
+    rename_column :email_settings, :rejected_email_template, :rejected_body
+    rename_column :email_settings, :confirmed_email_template, :confirmed_without_registration_body
+    rename_column :email_settings, :updated_conference_dates_template, :updated_conference_dates_body
+    rename_column :email_settings, :updated_conference_registration_dates_template, :updated_conference_registration_dates_body
+    rename_column :email_settings, :venue_update_template, :venue_update_body
+    rename_column :email_settings, :call_for_papers_dates_updates_template, :call_for_papers_dates_updates_body
+    rename_column :email_settings, :call_for_papers_schedule_public_template, :call_for_papers_schedule_public_body
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 086a703f..e8490163 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150415121038) do
+ActiveRecord::Schema.define(version: 20151005161518) do
 
   create_table "ahoy_events", force: true do |t|
     t.uuid     "visit_id"
@@ -158,35 +158,35 @@ ActiveRecord::Schema.define(version: 20150415121038) do
 
   create_table "email_settings", force: true do |t|
     t.integer  "conference_id"
-    t.boolean  "send_on_registration",                           default: false
-    t.boolean  "send_on_accepted",                               default: false
-    t.boolean  "send_on_rejected",                               default: false
-    t.boolean  "send_on_confirmed_without_registration",         default: false
-    t.text     "registration_email_template"
-    t.text     "accepted_email_template"
-    t.text     "rejected_email_template"
-    t.text     "confirmed_email_template"
+    t.boolean  "send_on_registration",                          default: false
+    t.boolean  "send_on_accepted",                              default: false
+    t.boolean  "send_on_rejected",                              default: false
+    t.boolean  "send_on_confirmed_without_registration",        default: false
+    t.text     "registration_body"
+    t.text     "accepted_body"
+    t.text     "rejected_body"
+    t.text     "confirmed_without_registration_body"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "registration_subject"
     t.string   "accepted_subject"
     t.string   "rejected_subject"
     t.string   "confirmed_without_registration_subject"
-    t.boolean  "send_on_updated_conference_dates",               default: false
+    t.boolean  "send_on_updated_conference_dates",              default: false
     t.string   "updated_conference_dates_subject"
-    t.text     "updated_conference_dates_template"
-    t.boolean  "send_on_updated_conference_registration_dates",  default: false
+    t.text     "updated_conference_dates_body"
+    t.boolean  "send_on_updated_conference_registration_dates", default: false
     t.string   "updated_conference_registration_dates_subject"
-    t.text     "updated_conference_registration_dates_template"
-    t.boolean  "send_on_venue_update",                           default: false
+    t.text     "updated_conference_registration_dates_body"
+    t.boolean  "send_on_venue_update",                          default: false
     t.string   "venue_update_subject"
-    t.text     "venue_update_template"
-    t.boolean  "send_on_call_for_papers_dates_updates",          default: false
-    t.boolean  "send_on_call_for_papers_schedule_public",        default: false
+    t.text     "venue_update_body"
+    t.boolean  "send_on_call_for_papers_dates_updates",         default: false
+    t.boolean  "send_on_call_for_papers_schedule_public",       default: false
     t.string   "call_for_papers_schedule_public_subject"
     t.string   "call_for_papers_dates_updates_subject"
-    t.text     "call_for_papers_schedule_public_template"
-    t.text     "call_for_papers_dates_updates_template"
+    t.text     "call_for_papers_schedule_public_body"
+    t.text     "call_for_papers_dates_updates_body"
   end
 
   create_table "event_types", force: true do |t|
@@ -515,7 +515,7 @@ ActiveRecord::Schema.define(version: 20150415121038) do
     t.integer  "photo_file_size"
     t.datetime "photo_updated_at"
     t.string   "street"
-    t.integer  "postalcode"
+    t.string   "postalcode"
     t.string   "city"
     t.string   "country"
     t.string   "latitude"
diff --git a/spec/factories/email_settings.rb b/spec/factories/email_settings.rb
index 4fc7764e..1255c6aa 100644
--- a/spec/factories/email_settings.rb
+++ b/spec/factories/email_settings.rb
@@ -10,18 +10,18 @@ FactoryGirl.define do
     send_on_updated_conference_registration_dates true
     send_on_call_for_papers_schedule_public true
     send_on_call_for_papers_dates_updates true
-    updated_conference_dates_template 'Sample Conference\n New Dates: January 17 - 21 2014'
+    updated_conference_dates_body 'Sample Conference\n New Dates: January 17 - 21 2014'
     updated_conference_dates_subject 'Conference dates have been updated'
     updated_conference_registration_dates_subject 'Conference registration dates have been updated'
-    updated_conference_registration_dates_template 'Sample Conference\n New Dates: January 17 - 21 2014'
+    updated_conference_registration_dates_body 'Sample Conference\n New Dates: January 17 - 21 2014'
     send_on_venue_update true
     venue_update_subject 'Venue has been updated'
-    venue_update_template 'Venue has been Updated to Sample Location'
+    venue_update_body 'Venue has been Updated to Sample Location'
     registration_subject 'Lorem Ipsum Dolsum'
-    registration_email_template 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit'
+    registration_body 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit'
     call_for_papers_dates_updates_subject 'Call for Papers dates have been updated'
-    call_for_papers_dates_updates_template 'Please checkout the new updates to submit your proposal for Sample Conference'
+    call_for_papers_dates_updates_body 'Please checkout the new updates to submit your proposal for Sample Conference'
     call_for_papers_schedule_public_subject 'Sample Conference Cfp schedule is Public'
-    call_for_papers_schedule_public_template 'Call for Papers schedule is Public.Checkout the link'
+    call_for_papers_schedule_public_body 'Call for Papers schedule is Public.Checkout the link'
   end
 end
diff --git a/spec/features/email_spec.rb b/spec/features/email_spec.rb
index e58b9680..973056f2 100644
--- a/spec/features/email_spec.rb
+++ b/spec/features/email_spec.rb
@@ -17,38 +17,38 @@ feature EmailSettings do
       click_link 'Onboarding'
       fill_in 'email_settings_registration_subject',
               with: 'Registration subject'
-      fill_in 'email_settings_registration_email_template',
+      fill_in 'email_settings_registration_body',
               with: 'Registration email body'
       click_link 'Proposal'
       fill_in 'email_settings_accepted_subject',
               with: 'Accepted subject'
-      fill_in 'email_settings_accepted_email_template',
+      fill_in 'email_settings_accepted_body',
               with: 'Accepted email body'
 
       fill_in 'email_settings_rejected_subject',
               with: 'Rejected subject'
-      fill_in 'email_settings_rejected_email_template',
+      fill_in 'email_settings_rejected_body',
               with: 'Rejected email body'
 
       fill_in 'email_settings_confirmed_without_registration_subject',
               with: 'Confirmed without registration subject'
-      fill_in 'email_settings_confirmed_email_template',
+      fill_in 'email_settings_confirmed_without_registration_body',
               with: 'Confirmed without registration email body'
 
       click_link 'Update Notifications'
       fill_in 'email_settings_updated_conference_dates_subject',
               with: 'Updated conference dates subject'
-      fill_in 'email_settings_updated_conference_dates_template',
+      fill_in 'email_settings_updated_conference_dates_body',
               with: 'Updated conference dates email template'
 
       fill_in 'email_settings_updated_conference_registration_dates_subject',
               with: 'Updated conference registration dates subject'
-      fill_in 'email_settings_updated_conference_registration_dates_template',
+      fill_in 'email_settings_updated_conference_registration_dates_body',
               with: 'Updated conference registration dates template'
 
       fill_in 'email_settings_venue_update_subject',
               with: 'Updated conference venue subject'
-      fill_in 'email_settings_venue_update_template',
+      fill_in 'email_settings_venue_update_body',
               with: 'Updated conference venue template'
 
       click_button 'Update Email settings'
@@ -58,33 +58,33 @@ feature EmailSettings do
 
       expect(find('#email_settings_registration_subject').
                  value).to eq('Registration subject')
-      expect(find('#email_settings_registration_email_template').
+      expect(find('#email_settings_registration_body').
                  value).to eq('Registration email body')
       click_link 'Proposal'
       expect(find('#email_settings_accepted_subject').
                  value).to eq('Accepted subject')
-      expect(find('#email_settings_accepted_email_template').
+      expect(find('#email_settings_accepted_body').
                  value).to eq('Accepted email body')
       expect(find('#email_settings_rejected_subject').
                  value).to eq('Rejected subject')
-      expect(find('#email_settings_rejected_email_template').
+      expect(find('#email_settings_rejected_body').
                  value).to eq('Rejected email body')
       expect(find('#email_settings_confirmed_without_registration_subject').
                  value).to eq('Confirmed without registration subject')
-      expect(find('#email_settings_confirmed_email_template').
+      expect(find('#email_settings_confirmed_without_registration_body').
                  value).to eq('Confirmed without registration email body')
       click_link 'Update Notifications'
       expect(find('#email_settings_updated_conference_dates_subject').
                  value).to eq('Updated conference dates subject')
-      expect(find('#email_settings_updated_conference_dates_template').
+      expect(find('#email_settings_updated_conference_dates_body').
                  value).to eq('Updated conference dates email template')
       expect(find('#email_settings_updated_conference_registration_dates_subject').
                  value).to eq('Updated conference registration dates subject')
-      expect(find('#email_settings_updated_conference_registration_dates_template').
+      expect(find('#email_settings_updated_conference_registration_dates_body').
                  value).to eq('Updated conference registration dates template')
       expect(find('#email_settings_venue_update_subject').
                  value).to eq('Updated conference venue subject')
-      expect(find('#email_settings_venue_update_template').
+      expect(find('#email_settings_venue_update_body').
                  value).to eq('Updated conference venue template')
 
       expect(EmailSettings.count).to eq(expected_count)