4 files changed, 15 insertions, 15 deletions
diff --git a/core/include/feed/main.php b/core/include/feed/main.php
index 671f5c7..8879e72 100644
--- a/core/include/feed/main.php
+++ b/core/include/feed/main.php
@@ -24,8 +24,8 @@ try {
 				$User = User\Factory::build($Post->attr('user'));
 
 				$ItemTemplate = Template\Factory::build('feed/item_post');
-				$ItemTemplate->set('POST', generatePostItemData($Post));
-				$ItemTemplate->set('USER', generateUserItemData($User));
+				$ItemTemplate->set('POST', generateItemTemplateData($Post));
+				$ItemTemplate->set('USER', generateItemTemplateData($User));
 
 				$posts[] = $ItemTemplate;
 			}
@@ -45,8 +45,8 @@ try {
 				$User = User\Factory::build($Page->attr('user'));
 
 				$ItemTemplate = Template\Factory::build('feed/item_page');
-				$ItemTemplate->set('PAGE', generatePageItemData($Page));
-				$ItemTemplate->set('USER', generateUserItemData($User));
+				$ItemTemplate->set('PAGE', generateItemTemplateData($Page));
+				$ItemTemplate->set('USER', generateItemTemplateData($User));
 
 				$pages[] = $ItemTemplate;
 			}
diff --git a/core/include/page/main.php b/core/include/page/main.php
index 01579fc..18ba4c8 100644
--- a/core/include/page/main.php
+++ b/core/include/page/main.php
@@ -19,20 +19,20 @@ try {
 
 	$User = User\Factory::build($Page->attr('user'));
 
-	$page_data = generatePageItemData($Page);
-	$user_data = generateUserItemData($User);
+	$page_data = generateItemTemplateData($Page);
+	$user_data = generateItemTemplateData($User);
 
 	#===============================================================================
 	# Add page data for previous and next page
 	#===============================================================================
 	try {
 		$PrevPage = Page\Factory::build($Page->getPrevID());
-		$page_data['PREV'] = generatePageItemData($PrevPage);
+		$page_data['PREV'] = generateItemTemplateData($PrevPage);
 	} catch(Page\Exception $Exception){}
 
 	try {
 		$NextPage = Page\Factory::build($Page->getNextID());
-		$page_data['NEXT'] = generatePageItemData($NextPage);
+		$page_data['NEXT'] = generateItemTemplateData($NextPage);
 	} catch(Page\Exception $Exception){}
 
 	#===============================================================================
diff --git a/core/include/post/main.php b/core/include/post/main.php
index 8cd0a49..f091a4c 100644
--- a/core/include/post/main.php
+++ b/core/include/post/main.php
@@ -19,20 +19,20 @@ try {
 
 	$User = User\Factory::build($Post->attr('user'));
 
-	$post_data = generatePostItemData($Post);
-	$user_data = generateUserItemData($User);
+	$post_data = generateItemTemplateData($Post);
+	$user_data = generateItemTemplateData($User);
 
 	#===============================================================================
 	# Add post data for previous and next post
 	#===============================================================================
 	try {
 		$PrevPost = Post\Factory::build($Post->getPrevID());
-		$post_data['PREV'] = generatePostItemData($PrevPost);
+		$post_data['PREV'] = generateItemTemplateData($PrevPost);
 	} catch(Post\Exception $Exception){}
 
 	try {
 		$NextPost = Post\Factory::build($Post->getNextID());
-		$post_data['NEXT'] = generatePostItemData($NextPost);
+		$post_data['NEXT'] = generateItemTemplateData($NextPost);
 	} catch(Post\Exception $Exception){}
 
 	#===============================================================================
diff --git a/core/include/user/main.php b/core/include/user/main.php
index ba0d07b..b2b054a 100644
--- a/core/include/user/main.php
+++ b/core/include/user/main.php
@@ -17,19 +17,19 @@ try {
 		$User = User\Factory::build($param);
 	}
 
-	$user_data = generateUserItemData($User);
+	$user_data = generateItemTemplateData($User);
 
 	#===============================================================================
 	# Add user data for previous and next user
 	#===============================================================================
 	try {
 		$PrevUser = User\Factory::build($User->getPrevID());
-		$user_data['PREV'] = generateUserItemData($PrevUser);
+		$user_data['PREV'] = generateItemTemplateData($PrevUser);
 	} catch(User\Exception $Exception){}
 
 	try {
 		$NextUser = User\Factory::build($User->getNextID());
-		$user_data['NEXT'] = generateUserItemData($NextUser);
+		$user_data['NEXT'] = generateItemTemplateData($NextUser);
 	} catch(User\Exception $Exception){}
 
 	#===============================================================================