diff --git a/admin/class-cf7-zwr-admin.php b/admin/class-cf7-zwr-admin.php
index 702a219..0e7cc1f 100644
--- a/admin/class-cf7-zwr-admin.php
+++ b/admin/class-cf7-zwr-admin.php
@@ -7,7 +7,7 @@
  * @subpackage CF7_ZWR/admin
  * @author     Usame Algan
  */
-class CF7_ZWR_admin {
+class CF7_ZWR_Admin {
 
     private $plugin_name;
     private $version;
diff --git a/includes/class-cf7-zwr-api.php b/includes/class-cf7-zwr-api.php
index ba6d480..45d5d5d 100644
--- a/includes/class-cf7-zwr-api.php
+++ b/includes/class-cf7-zwr-api.php
@@ -9,7 +9,7 @@
  * @subpackage CF7_ZWR/includes
  * @author     Usame Algan
  */
-class CF7_ZWR_api {
+class CF7_ZWR_Api {
     private $plugin_name;
     private $version;
 
@@ -70,7 +70,7 @@ public function send_registration($contactform, &$abort, $submission) {
 
         $webinar_id = $matches[0];
 
-        $field_parser = new CF7_ZWR_field_finder($posted_data);
+        $field_parser = new CF7_ZWR_Field_Finder($posted_data);
         $fields = $field_parser->combine(['prefixed', 'guessed']);
 
         if ($webinar_id) {
diff --git a/includes/class-cf7-zwr-field-finder.php b/includes/class-cf7-zwr-field-finder.php
index 394d80b..87700ba 100644
--- a/includes/class-cf7-zwr-field-finder.php
+++ b/includes/class-cf7-zwr-field-finder.php
@@ -8,7 +8,7 @@
  * @subpackage CF7_ZWR/includes
  * @author     Usame Algan
  */
-Class CF7_ZWR_field_finder {
+Class CF7_ZWR_Field_Finder {
     protected $fields;
 
     public function __construct($fields) {
@@ -37,7 +37,7 @@ public function guessed() {
         $fields_guessed = array();
 
         foreach($this->fields as $key => $value) {
-            if(preg_match('/email|mail/i', $key) || is_email($value)) {
+            if(preg_match('/email|mail/i', $key)) {
                 $fields_guessed["email"] = $value;
             }
 
diff --git a/includes/class-cf7-zwr-i18n.php b/includes/class-cf7-zwr-i18n.php
index 07318d2..acfe263 100644
--- a/includes/class-cf7-zwr-i18n.php
+++ b/includes/class-cf7-zwr-i18n.php
@@ -10,7 +10,7 @@
  * @subpackage CF7_ZWR/includes
  * @author     Usame Algan
  */
-class CF7_ZWR_i18n {
+class CF7_ZWR_I18N {
 
     public function load_plugin_textdomain() {
 
diff --git a/includes/class-cf7-zwr.php b/includes/class-cf7-zwr.php
index ad97fe6..15a29a0 100644
--- a/includes/class-cf7-zwr.php
+++ b/includes/class-cf7-zwr.php
@@ -38,19 +38,19 @@ private function load_dependencies() {
     }
 
     private function set_locale() {
-        $plugin_i18n = new CF7_ZWR_i18n();
+        $plugin_i18n = new CF7_ZWR_I18N();
         $this->loader->add_action( 'plugins_loaded', $plugin_i18n, 'load_plugin_textdomain' );
     }
 
     private function define_admin_hooks() {
-        $cf7_zwr_admin = new CF7_ZWR_admin( $this->get_plugin_name(), $this->get_version() );
+        $cf7_zwr_admin = new CF7_ZWR_Admin( $this->get_plugin_name(), $this->get_version() );
 
         $this->loader->add_action( 'admin_menu', $cf7_zwr_admin, 'add_setting_page' );
         $this->loader->add_action( 'admin_init', $cf7_zwr_admin, 'initialize_settings' );
     }
 
     private function define_public_hooks() {
-        $cf7_zwr_public = new CF7_ZWR_api( $this->get_plugin_name(), $this->get_version() );
+        $cf7_zwr_public = new CF7_ZWR_Api( $this->get_plugin_name(), $this->get_version() );
 
         $this->loader->add_action( 'wpcf7_before_send_mail', $cf7_zwr_public, 'send_registration', 10, 3 );
     }