diff --git a/modules/session/session.admin.controller.php b/modules/session/session.admin.controller.php
index 5dbc28e92..e078f660c 100644
--- a/modules/session/session.admin.controller.php
+++ b/modules/session/session.admin.controller.php
@@ -5,7 +5,7 @@
  * @author NAVER (developers@xpressengine.com)
  * @brief The admin controller class of the session module
  */
-class sessionAdminController extends session
+class SessionAdminController extends Session
 {
 	/**
 	 * @brief Initialization
diff --git a/modules/session/session.admin.view.php b/modules/session/session.admin.view.php
index d1d4098b2..7c6e5e9d7 100644
--- a/modules/session/session.admin.view.php
+++ b/modules/session/session.admin.view.php
@@ -5,7 +5,7 @@
  * @author NAVER (developers@xpressengine.com)
  * @brief The admin view class of the session module
  */
-class sessionAdminView extends session
+class SessionAdminView extends Session
 {
 	/**
 	 * @brief Initialization
diff --git a/modules/session/session.class.php b/modules/session/session.class.php
index f044b3325..c93268880 100644
--- a/modules/session/session.class.php
+++ b/modules/session/session.class.php
@@ -8,7 +8,7 @@
  *
  * The session management class
  */
-class session extends ModuleObject
+class Session extends ModuleObject
 {
 	var $lifetime = 18000;
 	var $session_started = false;
diff --git a/modules/session/session.controller.php b/modules/session/session.controller.php
index 1717cfe39..5335a1757 100644
--- a/modules/session/session.controller.php
+++ b/modules/session/session.controller.php
@@ -5,7 +5,7 @@
  * @author NAVER (developers@xpressengine.com)
  * @brief The controller class of the session module
  */
-class sessionController extends session
+class SessionController extends Session
 {
 	/**
 	 * @brief Initialization
diff --git a/modules/session/session.model.php b/modules/session/session.model.php
index 0b6056fe5..b9ef8583b 100644
--- a/modules/session/session.model.php
+++ b/modules/session/session.model.php
@@ -5,7 +5,7 @@
  * @author NAVER (developers@xpressengine.com)
  * @brief The Model class of the session module
  */
-class sessionModel extends session
+class SessionModel extends Session
 {
 	/**
 	 * @brief Initialization
diff --git a/modules/spamfilter/spamfilter.admin.controller.php b/modules/spamfilter/spamfilter.admin.controller.php
index 1558e3da2..ab17dd9ad 100644
--- a/modules/spamfilter/spamfilter.admin.controller.php
+++ b/modules/spamfilter/spamfilter.admin.controller.php
@@ -5,7 +5,7 @@
  * @author NAVER (developers@xpressengine.com)
  * @brief The admin controller class of the spamfilter module
  */
-class spamfilterAdminController extends spamfilter
+class SpamfilterAdminController extends Spamfilter
 {
 	/**
 	 * @brief Initialization
diff --git a/modules/spamfilter/spamfilter.admin.view.php b/modules/spamfilter/spamfilter.admin.view.php
index 1520a82a8..1e2f1e72f 100644
--- a/modules/spamfilter/spamfilter.admin.view.php
+++ b/modules/spamfilter/spamfilter.admin.view.php
@@ -5,7 +5,7 @@
  * @author NAVER (developers@xpressengine.com)
  * @brief The admin view class of the spamfilter module
  */
-class spamfilterAdminView extends spamfilter
+class SpamfilterAdminView extends Spamfilter
 {
 	/**
 	 * @brief Initialization
diff --git a/modules/spamfilter/spamfilter.class.php b/modules/spamfilter/spamfilter.class.php
index cc96c1957..d84fc609e 100644
--- a/modules/spamfilter/spamfilter.class.php
+++ b/modules/spamfilter/spamfilter.class.php
@@ -5,7 +5,7 @@
  * @author NAVER (developers@xpressengine.com)
  * @brief The parent class of the spamfilter module
  */
-class spamfilter extends ModuleObject
+class Spamfilter extends ModuleObject
 {
 	/**
 	 * @brief Additional tasks required to accomplish during the installation
diff --git a/modules/spamfilter/spamfilter.controller.php b/modules/spamfilter/spamfilter.controller.php
index d326335f8..13d5bd378 100644
--- a/modules/spamfilter/spamfilter.controller.php
+++ b/modules/spamfilter/spamfilter.controller.php
@@ -5,7 +5,7 @@
  * @author NAVER (developers@xpressengine.com)
  * @brief The controller class for the spamfilter module
  */
-class spamfilterController extends spamfilter
+class SpamfilterController extends Spamfilter
 {
 	/**
 	 * List of actions to use CAPTCHA.
diff --git a/modules/spamfilter/spamfilter.model.php b/modules/spamfilter/spamfilter.model.php
index 1ff9b3bd4..7318109cc 100644
--- a/modules/spamfilter/spamfilter.model.php
+++ b/modules/spamfilter/spamfilter.model.php
@@ -5,7 +5,7 @@
  * @author NAVER (developers@xpressengine.com)
  * @brief The Model class of the spamfilter module
  */
-class spamfilterModel extends spamfilter
+class SpamfilterModel extends Spamfilter
 {
 	/**
 	 * @brief Initialization
diff --git a/modules/tag/tag.admin.controller.php b/modules/tag/tag.admin.controller.php
index 958cfe75f..4766dd574 100644
--- a/modules/tag/tag.admin.controller.php
+++ b/modules/tag/tag.admin.controller.php
@@ -5,7 +5,7 @@
  * @author NAVER (developers@xpressengine.com)
  * @brief admin controller class of the tag module
  */
-class tagAdminController extends tag
+class TagAdminController extends Tag
 {
 	/**
 	 * Save admin config.
diff --git a/modules/tag/tag.admin.view.php b/modules/tag/tag.admin.view.php
index da0e7fad0..f3d30292a 100644
--- a/modules/tag/tag.admin.view.php
+++ b/modules/tag/tag.admin.view.php
@@ -1,6 +1,6 @@
 <?php
 
-class tagAdminView extends tag
+class TagAdminView extends Tag
 {
 	public function dispTagAdminConfig()
 	{
diff --git a/modules/tag/tag.class.php b/modules/tag/tag.class.php
index a84b94990..4cb196df8 100644
--- a/modules/tag/tag.class.php
+++ b/modules/tag/tag.class.php
@@ -5,7 +5,7 @@
  * @author NAVER (developers@xpressengine.com)
  * @brief high class of the tag module
  */
-class tag extends ModuleObject
+class Tag extends ModuleObject
 {
 	/**
 	 * @brief Implement if additional tasks are necessary when installing
diff --git a/modules/tag/tag.controller.php b/modules/tag/tag.controller.php
index f66ebc27f..3e3083fce 100644
--- a/modules/tag/tag.controller.php
+++ b/modules/tag/tag.controller.php
@@ -5,7 +5,7 @@
  * @author NAVER (developers@xpressengine.com)
  * @brief tag module's controller class
  */
-class tagController extends tag
+class TagController extends Tag
 {
 	/**
 	 * Parse tags.
diff --git a/modules/tag/tag.model.php b/modules/tag/tag.model.php
index 1e364534e..3c738330a 100644
--- a/modules/tag/tag.model.php
+++ b/modules/tag/tag.model.php
@@ -5,7 +5,7 @@
  * @author NAVER (developers@xpressengine.com)
  * @brief tag model class of the module
  */
-class tagModel extends tag
+class TagModel extends Tag
 {
 	/**
 	 * Separator regexp cache
diff --git a/modules/trash/trash.admin.controller.php b/modules/trash/trash.admin.controller.php
index a211ced3f..6f611ca33 100644
--- a/modules/trash/trash.admin.controller.php
+++ b/modules/trash/trash.admin.controller.php
@@ -8,7 +8,7 @@
  * @package /modules/trash
  * @version 0.1
  */
-class trashAdminController extends trash
+class TrashAdminController extends Trash
 {
 	/**
 	 * object insert to trash
diff --git a/modules/trash/trash.admin.view.php b/modules/trash/trash.admin.view.php
index 77faf320f..277b08e44 100644
--- a/modules/trash/trash.admin.view.php
+++ b/modules/trash/trash.admin.view.php
@@ -8,7 +8,7 @@
  * @package /modules/trash
  * @version 0.1
  */
-class trashAdminView extends trash
+class TrashAdminView extends Trash
 {
 	/**
 	 * Initialization
diff --git a/modules/trash/trash.class.php b/modules/trash/trash.class.php
index bc48a430a..372df1f6d 100644
--- a/modules/trash/trash.class.php
+++ b/modules/trash/trash.class.php
@@ -10,7 +10,7 @@ require_once(RX_BASEDIR.'modules/trash/model/TrashVO.php');
  * @package /modules/trash
  * @version 0.1
  */
-class trash extends ModuleObject
+class Trash extends ModuleObject
 {
 	/**
 	 * Implement if additional tasks are necessary when installing
diff --git a/modules/trash/trash.controller.php b/modules/trash/trash.controller.php
index 809dda99c..3e0b9f0c1 100644
--- a/modules/trash/trash.controller.php
+++ b/modules/trash/trash.controller.php
@@ -8,7 +8,7 @@
  * @package /modules/trash
  * @version 0.1
  */
-class trashController extends trash
+class TrashController extends Trash
 {
 }
 
diff --git a/modules/trash/trash.model.php b/modules/trash/trash.model.php
index 089eddd84..6c13d2015 100644
--- a/modules/trash/trash.model.php
+++ b/modules/trash/trash.model.php
@@ -8,7 +8,7 @@
  * @package /modules/trash
  * @version 0.1
  */
-class trashModel extends trash
+class TrashModel extends Trash
 {
 	private static $config = NULL;
 
diff --git a/modules/trash/trash.view.php b/modules/trash/trash.view.php
index 1562d133c..c5f359547 100644
--- a/modules/trash/trash.view.php
+++ b/modules/trash/trash.view.php
@@ -8,7 +8,7 @@
  * @package /modules/trash
  * @version 0.1
  */
-class trashView extends trash
+class TrashView extends Trash
 {
 	/**
 	 * Initialization
diff --git a/modules/widget/widget.admin.view.php b/modules/widget/widget.admin.view.php
index 702b44091..6e2192720 100644
--- a/modules/widget/widget.admin.view.php
+++ b/modules/widget/widget.admin.view.php
@@ -5,7 +5,7 @@
  * @author NAVER (developers@xpressengine.com)
  * @brief admin view class for widget modules
  */
-class widgetAdminView extends widget
+class WidgetAdminView extends Widget
 {
 	/**
 	 * @brief Initialization
diff --git a/modules/widget/widget.class.php b/modules/widget/widget.class.php
index 4fd69b21b..43b99a80f 100644
--- a/modules/widget/widget.class.php
+++ b/modules/widget/widget.class.php
@@ -5,7 +5,7 @@
  * @author NAVER (developers@xpressengine.com)
  * @brief widget module's high class
  */
-class widget extends ModuleObject
+class Widget extends ModuleObject
 {
 	/**
 	 * @brief Implement if additional tasks are necessary when installing
diff --git a/modules/widget/widget.controller.php b/modules/widget/widget.controller.php
index 951368804..d02ed05ea 100644
--- a/modules/widget/widget.controller.php
+++ b/modules/widget/widget.controller.php
@@ -5,7 +5,7 @@
  * @author NAVER (developers@xpressengine.com)
  * @brief Controller class for widget modules
  */
-class widgetController extends widget
+class WidgetController extends Widget
 {
 	// The results are not widget modify/delete and where to use the flag for
 	// layout_javascript_mode include all the results into the javascript mode Sikkim
diff --git a/modules/widget/widget.model.php b/modules/widget/widget.model.php
index 39b74bfb4..650842fec 100644
--- a/modules/widget/widget.model.php
+++ b/modules/widget/widget.model.php
@@ -6,7 +6,7 @@
  * @version 0.1
  * @brief Model class for widget modules
  */
-class widgetModel extends widget
+class WidgetModel extends Widget
 {
 	/**
 	 * @brief Initialization
diff --git a/modules/widget/widget.view.php b/modules/widget/widget.view.php
index 1d53fe127..90bc4be8c 100644
--- a/modules/widget/widget.view.php
+++ b/modules/widget/widget.view.php
@@ -5,7 +5,7 @@
  * @author NAVER (developers@xpressengine.com)
  * @brief View class of the widget modules
  */
-class widgetView extends widget
+class WidgetView extends Widget
 {
 	/**
 	 * @brief Initialization