diff --git a/system/pages/guilds/create_guild.php b/system/pages/guilds/create.php
similarity index 96%
rename from system/pages/guilds/create_guild.php
rename to system/pages/guilds/create.php
index c9d77ba7..0e89e0ef 100644
--- a/system/pages/guilds/create_guild.php
+++ b/system/pages/guilds/create.php
@@ -116,7 +116,7 @@ if(isset($todo) && $todo == 'save')
 			$player->setRank($rank);
 		}
 	}
-	echo $twig->render('guilds.create_guild.success.html.twig', array(
+	echo $twig->render('guilds.create.success.html.twig', array(
 		'guild_name' => $guild_name,
 		'leader_name' => $player->getName()
 	));
@@ -127,7 +127,7 @@ if(isset($todo) && $todo == 'save')
 }
 else {
 	sort($array_of_player_nig);
-	echo $twig->render('guilds.create_guild.html.twig', array(
+	echo $twig->render('guilds.create.html.twig', array(
 		'players' => $array_of_player_nig
 	));
 }
diff --git a/system/pages/guilds/list_of_guilds.php b/system/pages/guilds/list_of_guilds.php
index c9053cdf..8d059e62 100644
--- a/system/pages/guilds/list_of_guilds.php
+++ b/system/pages/guilds/list_of_guilds.php
@@ -66,7 +66,7 @@ if($_REQUEST['preview'] == 2)
 					<TD colspan="4">';
 	if($logged)
 		echo '
-					<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0><FORM ACTION="?subtopic=guilds&action=create_guild" METHOD=post><TR><TD>
+					<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0><FORM ACTION="?subtopic=guilds&action=create" METHOD=post><TR><TD>
 					<INPUT TYPE=image NAME="Create Guild" ALT="Create Guild" SRC="'.$template_path.'/images/global/buttons/sbutton_createguild.png" BORDER=0 WIDTH=120 HEIGHT=18>
 					</TD></TR></FORM></TABLE>';
 	
@@ -115,7 +115,7 @@ else
 
 echo '</TABLE><br><br>';
 if($logged)
-	echo '<TABLE BORDER=0 WIDTH=100%><TR><TD ALIGN=center><IMG SRC="'.$template_path.'/images/general/blank.gif" WIDTH=80 HEIGHT=1 BORDER=0<BR></TD><TD ALIGN=center><TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0><FORM ACTION="?subtopic=guilds&action=create_guild" METHOD=post><TR><TD>
+	echo '<TABLE BORDER=0 WIDTH=100%><TR><TD ALIGN=center><IMG SRC="'.$template_path.'/images/general/blank.gif" WIDTH=80 HEIGHT=1 BORDER=0<BR></TD><TD ALIGN=center><TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0><FORM ACTION="?subtopic=guilds&action=create" METHOD=post><TR><TD>
 		<INPUT TYPE=image NAME="Create Guild" ALT="Create Guild" SRC="'.$template_path.'/images/global/buttons/sbutton_createguild.png" BORDER=0 WIDTH=120 HEIGHT=18>
 		</TD></TR></FORM></TABLE></TD><TD ALIGN=center><IMG SRC="'.$template_path.'/images/general/blank.gif" WIDTH=80 HEIGHT=1 BORDER=0<BR></TD></TR></TABLE>
 		<BR />If you have any problem with guilds try:
diff --git a/system/templates/guilds.create_guild.html.twig b/system/templates/guilds.create.html.twig
similarity index 95%
rename from system/templates/guilds.create_guild.html.twig
rename to system/templates/guilds.create.html.twig
index e40cae20..499665b1 100644
--- a/system/templates/guilds.create_guild.html.twig
+++ b/system/templates/guilds.create.html.twig
@@ -1,4 +1,4 @@
-<form action="?subtopic=guilds&action=create_guild&todo=save" method="post">
+<form action="?subtopic=guilds&action=create&todo=save" method="post">
 	<table width="100%" border="0" cellspacing="1" cellpadding="4">
 		<tr>
 			<td bgcolor="{{ config.vdarkborder }}" class="white"><B>Create a {{ config.lua.serverName }} Guild</b></td>
diff --git a/system/templates/guilds.create_guild.success.html.twig b/system/templates/guilds.create.success.html.twig
similarity index 100%
rename from system/templates/guilds.create_guild.success.html.twig
rename to system/templates/guilds.create.success.html.twig