diff --git a/admin_tickets.php b/admin_tickets.php
index ce89bd7f..8a163628 100644
--- a/admin_tickets.php
+++ b/admin_tickets.php
@@ -228,7 +228,7 @@ if($page == 'tickets'
 				$priorities.= makeoption($lng['ticket']['unf_normal'], '2', $settings['ticket']['default_priority']);
 				$priorities.= makeoption($lng['ticket']['unf_low'], '3', $settings['ticket']['default_priority']);
 
-				$ticket_new_data = include_once dirname(__FILE__).'/lib/formfields/admin/ticket/formfield.ticket_new.php';
+				$ticket_new_data = include_once dirname(__FILE__).'/lib/formfields/admin/tickets/formfield.ticket_new.php';
 				$ticket_new_form = htmlform::genHTMLForm($ticket_new_data);
 
 				$title = $ticket_new_data['ticket_new']['title'];
@@ -345,7 +345,7 @@ if($page == 'tickets'
 			$ticket_replies_count = $db->num_rows($andere) + 1;
 
 			// don't forget the main-ticket!
-			$ticket_reply_data = include_once dirname(__FILE__).'/lib/formfields/admin/ticket/formfield.ticket_reply.php';
+			$ticket_reply_data = include_once dirname(__FILE__).'/lib/formfields/admin/tickets/formfield.ticket_reply.php';
 			$ticket_reply_form = htmlform::genHTMLForm($ticket_reply_data);
 
 			$title = $ticket_reply_data['ticket_reply']['title'];
@@ -504,7 +504,7 @@ elseif($page == 'categories'
 		{
 			$order = ticket::getHighestOrderNumber($db) + 1;
 
-			$category_new_data = include_once dirname(__FILE__).'/lib/formfields/admin/ticket/formfield.category_new.php';
+			$category_new_data = include_once dirname(__FILE__).'/lib/formfields/admin/tickets/formfield.category_new.php';
 			$category_new_form = htmlform::genHTMLForm($category_new_data);
 
 			$title = $category_new_data['category_new']['title'];
@@ -542,7 +542,7 @@ elseif($page == 'categories'
 		{
 			$row = $db->query_first('SELECT * FROM `' . TABLE_PANEL_TICKET_CATS . '` WHERE `id` = "' . (int)$id . '"');
 
-			$category_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/ticket/formfield.category_edit.php';
+			$category_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/tickets/formfield.category_edit.php';
 			$category_edit_form = htmlform::genHTMLForm($category_edit_data);
 
 			$title = $category_edit_data['category_edit']['title'];
diff --git a/customer_tickets.php b/customer_tickets.php
index c14a6f43..56d74885 100644
--- a/customer_tickets.php
+++ b/customer_tickets.php
@@ -248,7 +248,7 @@ elseif($page == 'tickets')
 
 				$ticketsopen = (int)$opentickets['count'];
 
-				$ticket_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/ticket/formfield.ticket_add.php';
+				$ticket_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/tickets/formfield.ticket_add.php';
 				$ticket_add_form = htmlform::genHTMLForm($ticket_add_data);
 
 				$title = $ticket_add_data['ticket_add']['title'];
@@ -367,7 +367,7 @@ elseif($page == 'tickets')
 
 			// don't forget the main-ticket!
 
-			$ticket_reply_data = include_once dirname(__FILE__).'/lib/formfields/customer/ticket/formfield.ticket_reply.php';
+			$ticket_reply_data = include_once dirname(__FILE__).'/lib/formfields/customer/tickets/formfield.ticket_reply.php';
 			$ticket_reply_form = htmlform::genHTMLForm($ticket_reply_data);
 
 			$title = $ticket_reply_data['ticket_reply']['title'];
diff --git a/lib/formfields/admin/ticket/formfield.category_edit.php b/lib/formfields/admin/tickets/formfield.category_edit.php
similarity index 100%
rename from lib/formfields/admin/ticket/formfield.category_edit.php
rename to lib/formfields/admin/tickets/formfield.category_edit.php
diff --git a/lib/formfields/admin/ticket/formfield.category_new.php b/lib/formfields/admin/tickets/formfield.category_new.php
similarity index 100%
rename from lib/formfields/admin/ticket/formfield.category_new.php
rename to lib/formfields/admin/tickets/formfield.category_new.php
diff --git a/lib/formfields/admin/ticket/formfield.ticket_new.php b/lib/formfields/admin/tickets/formfield.ticket_new.php
similarity index 100%
rename from lib/formfields/admin/ticket/formfield.ticket_new.php
rename to lib/formfields/admin/tickets/formfield.ticket_new.php
diff --git a/lib/formfields/admin/ticket/formfield.ticket_reply.php b/lib/formfields/admin/tickets/formfield.ticket_reply.php
similarity index 100%
rename from lib/formfields/admin/ticket/formfield.ticket_reply.php
rename to lib/formfields/admin/tickets/formfield.ticket_reply.php
diff --git a/lib/formfields/customer/ticket/formfield.ticket_add.php b/lib/formfields/customer/tickets/formfield.ticket_add.php
similarity index 100%
rename from lib/formfields/customer/ticket/formfield.ticket_add.php
rename to lib/formfields/customer/tickets/formfield.ticket_add.php
diff --git a/lib/formfields/customer/ticket/formfield.ticket_reply.php b/lib/formfields/customer/tickets/formfield.ticket_reply.php
similarity index 100%
rename from lib/formfields/customer/ticket/formfield.ticket_reply.php
rename to lib/formfields/customer/tickets/formfield.ticket_reply.php