diff --git a/src/Citco/Mailer/MailerServiceProvider.php b/src/Citco/Mailer/MailerServiceProvider.php
index ad921dc..7902ce3 100644
--- a/src/Citco/Mailer/MailerServiceProvider.php
+++ b/src/Citco/Mailer/MailerServiceProvider.php
@@ -39,11 +39,11 @@ public function register()
 				$mailer->alwaysFrom($from['address'], $from['name']);
 			}
 
-			$mailer->x_site_id = config('mailer.site.id');
-			$mailer->sender_addr = array(config('mailer.noreply.address'), config('mailer.noreply.name'));
-			$mailer->log_addr = array(config('mailer.log.address'), config('mailer.log.name'));
-			$mailer->developer_addr = array(config('mailer.dev.address'), config('mailer.dev.name'));
-			$mailer->return_path = config('mailer.return.path');
+			$mailer->x_site_id = config('mailer.site_id');
+			$mailer->sender_addr = array(config('mailer.noreply_address'), config('mailer.noreply_name'));
+			$mailer->log_addr = array(config('mailer.log_address'), config('mailer.log_name'));
+			$mailer->developer_addr = array(config('mailer.dev_address'), config('mailer.dev_name'));
+			$mailer->return_path = config('mailer.return_path');
 
 			// Here we will determine if the mailer should be in "pretend" mode for this
 			// environment, which will simply write out e-mail to the logs instead of
diff --git a/src/config/mailer.php b/src/config/mailer.php
index e789e89..b2a007d 100644
--- a/src/config/mailer.php
+++ b/src/config/mailer.php
@@ -2,20 +2,20 @@
 return array(
 
 	// This variable is used to set X-Site-ID
-	'site.id' => 'site',
+	'site_id' => 'site',
 
 	// All outgoing emails should be sent from this address
-	'noreply.address' => 'noreply@example.com',
-	'noreply.name' => 'no-reply',
+	'noreply_address' => 'noreply@example.com',
+	'noreply_name' => 'no-reply',
 
 	// A copy of all emails should be sent to this address
-	'log.address' => null,
-	'log.name' => null,
+	'log_address' => null,
+	'log_name' => null,
 
 	// All emails in local and dev environment should be sent to this address
-	'dev.address' => 'developer@example.com',
-	'dev.name' => 'Devel',
+	'dev_address' => 'developer@example.com',
+	'dev_name' => 'Devel',
 
-	'return.path' => '',
+	'return_path' => '',
 
 );