renamed email related properties with prefix 'email_'