diff --git a/add-alias.php b/add-alias.php
index 6cd3c92..49c73da 100644
--- a/add-alias.php
+++ b/add-alias.php
@@ -49,11 +49,11 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") {
 	$goto = filter_var($goto, FILTER_VALIDATE_EMAIL);
 
 	if ($list_domains[$domain_key]['aliases'] != 0 && $list_domains[$domain_key]['alias_count'] >= $list_domains[$domain_key]['aliases']) {
-		$message = $LANG['Create_alias_address_text_error2'];
+		$message = $LANG['Add_alias_address_text_error2'];
 	}
 
 	if (empty($address) || empty($goto)) {
-		$message = $LANG['Create_alias_address_text_error1'];
+		$message = $LANG['Add_alias_address_text_error1'];
 	}
 
 	if ($domain_exist && empty($message)) {
@@ -65,11 +65,11 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") {
 			$sth->bindParam(3, $domain, PDO::PARAM_STR);
 			$sth->execute();
 			logging($admin, $domain, $LANG['Logging_alias_add'], "$from -> $goto");
-			$message = $LANG['Create_alias_result_succes'] . "<br />($from -> $goto)</br />";
+			$message = $LANG['Add_alias_result_succes'] . "<br />($from -> $goto)</br />";
 			$address = '';
 			$goto = '';
  		} catch(PDOException $e) { 
-			$message = $LANG['Create_alias_result_error'] . "<br />($from -> $goto)<br />";
+			$message = $LANG['Add_alias_result_error'] . "<br />($from -> $goto)<br />";
 		}
 	}
 }
diff --git a/add-mailbox.php b/add-mailbox.php
index febb098..7c33a7c 100644
--- a/add-mailbox.php
+++ b/add-mailbox.php
@@ -48,15 +48,15 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") {
         $from = filter_var($username . '@' . $domain, FILTER_VALIDATE_EMAIL);
 
         if ($list_domains[$domain_key]['mailboxes'] != 0 && $list_domains[$domain_key]['mailbox_count'] >= $list_domains[$domain_key]['mailboxes']) {
-		$message = $LANG['Create_mailbox_username_text_error3'];
+		$message = $LANG['Add_mailbox_username_text_error3'];
 	}
 	 
 	if (empty($username)) {
-		$message = $LANG['Create_mailbox_username_text_error1'];
+		$message = $LANG['Add_mailbox_username_text_error1'];
 	}
 
 	if (empty($password1) or ($password1 != $password2)) {
-		$message = $LANG['Create_mailbox_password_text_error'];
+		$message = $LANG['Add_mailbox_password_text_error'];
 	}
 
 	if ($domain_exist && empty($message)) {
@@ -71,7 +71,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") {
 			$sth->execute();
 			$username = '';
  		} catch(PDOException $e) { 
-			$message = $LANG['Create_alias_result_error'] . "<br />($from) - $e<br />";
+			$message = $LANG['Add_alias_result_error'] . "<br />($from) - $e<br />";
 		}
 
 		try {
@@ -84,11 +84,11 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") {
 			$sth->bindParam(5, $domain, PDO::PARAM_STR);
 			$sth->execute();
 			logging($admin, $domain, $LANG['Logging_mailbox_add'], "$from");
-			$message = $LANG['Create_mailbox_result_succes'] . "<br />($from)";
+			$message = $LANG['Add_mailbox_result_succes'] . "<br />($from)";
 			$username = '';
 			$name = '';
  		} catch(PDOException $e) { 
-			$message = $LANG['Create_alias_result_error'] . "<br />($from) - $e<br />";
+			$message = $LANG['Add_alias_result_error'] . "<br />($from) - $e<br />";
 		}
 	}
 }
diff --git a/admin/add-alias.php b/admin/add-alias.php
index b33ef41..42233f0 100644
--- a/admin/add-alias.php
+++ b/admin/add-alias.php
@@ -48,11 +48,11 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") {
 	$goto = filter_var($goto, FILTER_VALIDATE_EMAIL);
 
 	if ($list_domains[$domain_key]['aliases'] != 0 && $list_domains[$domain_key]['alias_count'] >= $list_domains[$domain_key]['aliases']) {
-		$message = $LANG['Create_alias_address_text_error2'];
+		$message = $LANG['Add_alias_address_text_error2'];
 	}
 
 	if (empty($address) || empty($goto)) {
-		$message = $LANG['Create_alias_address_text_error1'];
+		$message = $LANG['Add_alias_address_text_error1'];
 	}
 
 	if ($domain_exist && empty($message)) {
@@ -64,11 +64,11 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") {
 			$sth->bindParam(3, $domain, PDO::PARAM_STR);
 			$sth->execute();
 			logging($admin, $domain, $LANG['Logging_alias_add'], "$from -> $goto");
-			$message = $LANG['Create_alias_result_succes'] . "<br />($from -> $goto)</br />";
+			$message = $LANG['Add_alias_result_succes'] . "<br />($from -> $goto)</br />";
 			$address = '';
 			$goto = '';
  		} catch(PDOException $e) { 
-			$message = $LANG['Create_alias_result_error'] . "<br />($from -> $goto)<br />";
+			$message = $LANG['Add_alias_result_error'] . "<br />($from -> $goto)<br />";
 		}
 	}
 }
diff --git a/admin/add-mailbox.php b/admin/add-mailbox.php
index a32fcc2..88ab3d2 100644
--- a/admin/add-mailbox.php
+++ b/admin/add-mailbox.php
@@ -47,15 +47,15 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") {
         $from = filter_var($username . '@' . $domain, FILTER_VALIDATE_EMAIL);
 
         if ($list_domains[$domain_key]['mailboxes'] != 0 && $list_domains[$domain_key]['mailbox_count'] >= $list_domains[$domain_key]['mailboxes']) {
-		$message = $LANG['Create_mailbox_username_text_error3'];
+		$message = $LANG['Add_mailbox_username_text_error3'];
 	}
 	 
 	if (empty($username)) {
-		$message = $LANG['Create_mailbox_username_text_error1'];
+		$message = $LANG['Add_mailbox_username_text_error1'];
 	}
 
 	if (empty($password1) or ($password1 != $password2)) {
-		$message = $LANG['Create_mailbox_password_text_error'];
+		$message = $LANG['Add_mailbox_password_text_error'];
 	}
 
 	if ($domain_exist && empty($message)) {
@@ -70,7 +70,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") {
 			$sth->execute();
 			$username = '';
  		} catch(PDOException $e) { 
-			$message = $LANG['Create_alias_result_error'] . "<br />($from) - $e<br />";
+			$message = $LANG['Add_alias_result_error'] . "<br />($from) - $e<br />";
 		}
 
 		try {
@@ -83,11 +83,11 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") {
 			$sth->bindParam(5, $domain, PDO::PARAM_STR);
 			$sth->execute();
 			logging($admin, $domain, $LANG['Logging_mailbox_add'], "$from");
-			$message = $LANG['Create_mailbox_result_succes'] . "<br />($from)";
+			$message = $LANG['Add_mailbox_result_succes'] . "<br />($from)";
 			$username = '';
 			$name = '';
  		} catch(PDOException $e) { 
-			$message = $LANG['Create_alias_result_error'] . "<br />($from) - $e<br />";
+			$message = $LANG['Add_alias_result_error'] . "<br />($from) - $e<br />";
 		}
 	}
 }
diff --git a/languages/en.lang b/languages/en.lang
index 6f4df5e..24f6678 100644
--- a/languages/en.lang
+++ b/languages/en.lang
@@ -62,16 +62,16 @@ $LANG['Overview_get_modified'] = 'Last Modified';
 $LANG['Delete_delete_error'] = '<span class="error_msg">Unable to delete the entry ';
 $LANG['Delete_domain_error'] = '<span class="error_msg">This domain is not yours ';
 
-$LANG['Create_alias_welcome'] = 'Create a new alias for your domain.';
-$LANG['Create_alias_address'] = 'Alias';
-$LANG['Create_alias_address_text_error1'] = '<span class="error_msg">The ALIAS or TO is not valid.</span>';
-$LANG['Create_alias_address_text_error2'] = '<span class="error_msg">You have reached your limit to create aliases.</span>';
-$LANG['Create_alias_goto'] = 'To';
-$LANG['Create_alias_button'] = 'Add Alias';
-$LANG['Create_alias_goto_text'] = 'Where the mail needs to be send to.';
-$LANG['Create_alias_result_error'] = '<span class="error_msg">This email address already exists, unable to add to the alias table.</span>';
-$LANG['Create_alias_result_succes'] = 'The alias has been added to the alias table.';
-$LANG['Create_alias_catchall_text'] = 'To create a catch-all use an "*" as alias.<br />For domain to domain forwarding use "*@domain.tld" as to.';
+$LANG['Add_alias_welcome'] = 'Create a new alias for your domain.';
+$LANG['Add_alias_address'] = 'Alias';
+$LANG['Add_alias_address_text_error1'] = '<span class="error_msg">The ALIAS or TO is not valid.</span>';
+$LANG['Add_alias_address_text_error2'] = '<span class="error_msg">You have reached your limit to create aliases.</span>';
+$LANG['Add_alias_goto'] = 'To';
+$LANG['Add_alias_button'] = 'Add Alias';
+$LANG['Add_alias_goto_text'] = 'Where the mail needs to be send to.';
+$LANG['Add_alias_result_error'] = '<span class="error_msg">This email address already exists, unable to add to the alias table.</span>';
+$LANG['Add_alias_result_succes'] = 'The alias has been added to the alias table.';
+$LANG['Add_alias_catchall_text'] = 'To create a catch-all use an "*" as alias.<br />For domain to domain forwarding use "*@domain.tld" as to.';
 
 $LANG['Edit_alias_welcome'] = 'Edit an alias for your domain.<br />One entry per line.';
 $LANG['Edit_alias_address'] = 'Alias';
@@ -83,21 +83,21 @@ $LANG['Edit_alias_domain_error'] = '<span class="error_msg">This domain is not y
 $LANG['Edit_alias_button'] = 'Edit Alias';
 $LANG['Edit_alias_result_error'] = '<span class="error_msg">Unable to modify the alias.</span>';
 
-$LANG['Create_mailbox_welcome'] = 'Create a new mailbox for your domain.';
-$LANG['Create_mailbox_username'] = 'Username';
-$LANG['Create_mailbox_username_text_error1'] = '<span class="error_msg">The USERNAME is not valid.</span>';
-$LANG['Create_mailbox_username_text_error2'] = '<span class="error_msg">This email address already exists, please choose a different one.</span>';
-$LANG['Create_mailbox_username_text_error3'] = '<span class="error_msg">You have reached your limit to create mailboxes.</span>';
-$LANG['Create_mailbox_password'] = 'Password';
-$LANG['Create_mailbox_password2'] = 'Password (again)';
-$LANG['Create_mailbox_password_text'] = 'Password for POP3/IMAP';
-$LANG['Create_mailbox_password_text_error'] = '<span class="error_msg">The passwords that you supplied don\'t match, or are empty.</span>';
-$LANG['Create_mailbox_name'] = 'Name';
-$LANG['Create_mailbox_name_text'] = 'Full name';
-$LANG['Create_mailbox_mail'] = 'Create mailbox';
-$LANG['Create_mailbox_button'] = 'Add Mailbox';
-$LANG['Create_mailbox_result_error'] = '<span class="error_msg">Unable to add the mailbox to the mailbox table.</span>';
-$LANG['Create_mailbox_result_succes'] = 'The mailbox has been added to the mailbox table.';
+$LANG['Add_mailbox_welcome'] = 'Create a new mailbox for your domain.';
+$LANG['Add_mailbox_username'] = 'Username';
+$LANG['Add_mailbox_username_text_error1'] = '<span class="error_msg">The USERNAME is not valid.</span>';
+$LANG['Add_mailbox_username_text_error2'] = '<span class="error_msg">This email address already exists, please choose a different one.</span>';
+$LANG['Add_mailbox_username_text_error3'] = '<span class="error_msg">You have reached your limit to create mailboxes.</span>';
+$LANG['Add_mailbox_password'] = 'Password';
+$LANG['Add_mailbox_password2'] = 'Password (again)';
+$LANG['Add_mailbox_password_text'] = 'Password for POP3/IMAP';
+$LANG['Add_mailbox_password_text_error'] = '<span class="error_msg">The passwords that you supplied don\'t match, or are empty.</span>';
+$LANG['Add_mailbox_name'] = 'Name';
+$LANG['Add_mailbox_name_text'] = 'Full name';
+$LANG['Add_mailbox_mail'] = 'Create mailbox';
+$LANG['Add_mailbox_button'] = 'Add Mailbox';
+$LANG['Add_mailbox_result_error'] = '<span class="error_msg">Unable to add the mailbox to the mailbox table.</span>';
+$LANG['Add_mailbox_result_succes'] = 'The mailbox has been added to the mailbox table.';
 
 $LANG['Edit_mailbox_welcome'] = 'Edit a mailbox for your domain.';
 $LANG['Edit_mailbox_username'] = 'Username';
diff --git a/templates/add-alias.tpl b/templates/add-alias.tpl
index bca4f98..1f4cdcf 100644
--- a/templates/add-alias.tpl
+++ b/templates/add-alias.tpl
@@ -2,10 +2,10 @@
 <form name="create_alias" method="post">
 <table>
 	<tr>
-		<td colspan="3"><h3><?php echo $LANG['Create_alias_welcome']; ?></h3></td>
+		<td colspan="3"><h3><?php echo $LANG['Add_alias_welcome']; ?></h3></td>
 	</tr>
 	<tr>
-		<td><?php echo $LANG['Create_alias_address']; ?></td>
+		<td><?php echo $LANG['Add_alias_address']; ?></td>
 		<td><input class="flat" type="text" name="address" value="<?php echo $address ?? ''; ?>" /></td>
 		<td>
 		<select name="domain">
@@ -20,12 +20,12 @@
 		</td>
 	</tr>
 	<tr>
-		<td><?php echo $LANG['Create_alias_goto'] . ":"; ?></td>
+		<td><?php echo $LANG['Add_alias_goto'] . ":"; ?></td>
 		<td><input class="flat" type="text" name="goto" value="<?php echo $goto ?? ''; ?>" /></td>
-		<td><?php echo $LANG['Create_alias_goto_text']; ?></td>
+		<td><?php echo $LANG['Add_alias_goto_text']; ?></td>
 	</tr>
 	<tr>
-		<td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php echo $LANG['Create_alias_button']; ?>" /></td>
+		<td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php echo $LANG['Add_alias_button']; ?>" /></td>
 	</tr>
 	<tr>
 		<td colspan="3" class="standout"><?php echo $message ?? '&nbsp;'; ?></td>
diff --git a/templates/add-mailbox.tpl b/templates/add-mailbox.tpl
index 96286bf..26f3cce 100644
--- a/templates/add-mailbox.tpl
+++ b/templates/add-mailbox.tpl
@@ -2,10 +2,10 @@
 <form name="create_mailbox" method="post">
 <table>
 	<tr>
-		<td colspan="3"><h3><?php echo $LANG['Create_mailbox_welcome']; ?></h3></td>
+		<td colspan="3"><h3><?php echo $LANG['Add_mailbox_welcome']; ?></h3></td>
 	</tr>
 	<tr>
-		<td><?php echo $LANG['Create_mailbox_username'] . ":"; ?></td>
+		<td><?php echo $LANG['Add_mailbox_username'] . ":"; ?></td>
 		<td><input class="flat" type="text" name="username" value="<?php echo $username ?? ''; ?>" /></td>
 		<td>
 		<select name="domain">
@@ -20,22 +20,22 @@
 		</td>
 	</tr>
 	<tr>
-		<td><?php echo $LANG['Create_mailbox_password'] . ":"; ?></td>
+		<td><?php echo $LANG['Add_mailbox_password'] . ":"; ?></td>
 		<td><input class="flat" type="password" name="password1" /></td>
-		<td><?php echo $LANG['Create_mailbox_password_text']; ?></td>
+		<td><?php echo $LANG['Add_mailbox_password_text']; ?></td>
 	</tr>
 	<tr>
-		<td><?php echo $LANG['Create_mailbox_password2'] . ":"; ?></td>
+		<td><?php echo $LANG['Add_mailbox_password2'] . ":"; ?></td>
 		<td><input class="flat" type="password" name="password2" /></td>
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td><?php echo $LANG['Create_mailbox_name'] . ":"; ?></td>
+		<td><?php echo $LANG['Add_mailbox_name'] . ":"; ?></td>
 		<td><input class="flat" type="text" name="name" value="<?php echo $name ?? ''; ?>" /></td>
-		<td><?php echo $LANG['Create_mailbox_name_text']; ?></td>
+		<td><?php echo $LANG['Add_mailbox_name_text']; ?></td>
 	</tr>
 	<tr>
-		<td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php echo $LANG['Create_mailbox_button']; ?>" /></td>
+		<td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php echo $LANG['Add_mailbox_button']; ?>" /></td>
 	</tr>
 	<tr>
 		<td colspan="3" class="standout"><?php echo $message ?? '&nbsp'; ?></td>