diff --git a/module/product/ui/all.html.php b/module/product/ui/all.html.php
index c35a334935..6380af3107 100644
--- a/module/product/ui/all.html.php
+++ b/module/product/ui/all.html.php
@@ -83,7 +83,7 @@ featureBar
 (
     to::before
     (
-        programmenu
+        programMenu
         (
             setStyle(array('margin-right' => '20px')),
             set
@@ -182,7 +182,7 @@ dtable
 
 sidebar
 (
-    modulemenu
+    moduleMenu
     (
         set::productID(1),
         set::title('所有分类'),
diff --git a/module/program/ui/browse.html.php b/module/program/ui/browse.html.php
index ed0f3ceafc..55f09d2fbc 100644
--- a/module/program/ui/browse.html.php
+++ b/module/program/ui/browse.html.php
@@ -20,7 +20,7 @@ featureBar
 (
     to::before
     (
-        programmenu
+        programMenu
         (
            set
            (
diff --git a/module/project/ui/browse.html.php b/module/project/ui/browse.html.php
index 589be581e7..9765e1fe47 100644
--- a/module/project/ui/browse.html.php
+++ b/module/project/ui/browse.html.php
@@ -314,9 +314,9 @@ h::js($jsSearch);
 
 header();
 
-pagemain
+pageMain
 (
-    mainmenu
+    mainMenu
     (
         set('statuses', $statuses),
         set('others', $others),
diff --git a/module/search/ui/buildform.html.php b/module/search/ui/buildform.html.php
index b9822815dd..d20833c9af 100644
--- a/module/search/ui/buildform.html.php
+++ b/module/search/ui/buildform.html.php
@@ -8,6 +8,6 @@ jsVar('canSaveQuery', !empty($_SESSION[$module . 'Query']));
 jsVar('formSession', $_SESSION[$module . 'Form']);
 jsVar('onMenuBar', $onMenuBar);
 
-zui::searchform(set($exampleOptions), set::_to('#searchFormPanel'), set::className('shadow'));
+zui::searchForm(set($exampleOptions), set::_to('#searchFormPanel'), set::className('shadow'));
 
 render('fragment');
diff --git a/module/task/ui/create.html.php b/module/task/ui/create.html.php
index da76d97ff4..276dd95d70 100644
--- a/module/task/ui/create.html.php
+++ b/module/task/ui/create.html.php
@@ -23,20 +23,20 @@ page(
     .form-label { width: 6rem !important; }
     END),
     set('title', $title),
-    pageheader
+    pageHeader
     (
-        pageheading
+        pageHeading
         (
             set('text', $lang->{$app->tab}->common),
             set('icon', $app->tab),
             set('url', \helper::createLink($app->tab, 'browse')),
         ),
-        pagenavbar
+        pageNavbar
         (
             setId('navbar'),
             set('items', $navItems)
         ),
-        pagetoolbar
+        pageToolbar
         (
             set('create',   array('href' => '#globalCreateMenu')),
             set('switcher', array('href' => '#switcherMenu', 'text' => '研发管理界面')),
@@ -58,9 +58,9 @@ page(
         div
         (
             setStyle(array('padding-left' => '3rem', 'padding-bottom' => '1rem')),
-            formgrid
+            formGrid
             (
-                formgroup
+                formGroup
                 (
                     set('label', array('required' => true, 'text' => $lang->task->execution)),
                     select(
@@ -69,7 +69,7 @@ page(
                         set('items', array_map(function($v, $k) {return array('text' => $v, 'value' => $k, 'selected' => $k == $execution->id);}, $executions, array_keys($executions)))
                     )
                 ),
-                formgroup
+                formGroup
                 (
                     set('label', array('required' => true, 'text' => $lang->task->type)),
                     select
@@ -79,10 +79,10 @@ page(
                         set('items', array_map(function($v, $k) {return array('text' => $v, 'value' => $k, 'selected' => $k === $task->type);}, $lang->task->typeList, array_keys($lang->task->typeList)))
                     )
                 ),
-                formgroup
+                formGroup
                 (
                     set('label', array('text' => $lang->task->module)),
-                    formrow
+                    formRow
                     (
                         setClass('items-center'),
                         select
@@ -98,7 +98,7 @@ page(
                         )
                     ),
                 ),
-                formgroup
+                formGroup
                 (
                     set('label', array('text' => $lang->task->story)),
                     select(
@@ -107,13 +107,13 @@ page(
                         set('items', array_map(function($v, $k) {return array('text' => $v, 'value' => $k, 'selected' => $k === $task->story);}, $stories, array_keys($stories)))
                     )
                 ),
-                formgroup
+                formGroup
                 (
                     set('name', 'name'),
                     set('label', array('text' => $lang->task->name, 'required' => true)),
-                    forminput(setClass('w-740')),
+                    formInput(setClass('w-740')),
                 ),
-                formgroup
+                formGroup
                 (
                     set('name', 'pri'),
                     set('label', array('text' => $lang->task->pri)),
@@ -123,10 +123,10 @@ page(
                         set('items', array_map(function($v, $k) {return array('text' => $v, 'value' => $k, 'selected' => $k === $task->pri);}, $lang->task->priList, array_keys($lang->task->priList)))
                     )
                 ),
-                formrow
+                formRow
                 (
                     setClass('items-center'),
-                    formgroup
+                    formGroup
                     (
                         set('label', array('text' => $lang->task->assignedTo)),
                         select
@@ -136,10 +136,10 @@ page(
                             set('items', array_map(function($v, $k) {return array('text' => $v, 'value' => $k, 'selected' => $k === $task->assignedTo);}, $members, array_keys($members)))
                         )
                     ),
-                    formgroup
+                    formGroup
                     (
                         set('label', array('text' => $lang->task->estimateAB, 'auto' => true)),
-                        inputgroup
+                        inputGroup
                         (
                             set('items', array(
                                 array('type' => 'input', 'class' => 'w-60', 'name' => 'estimate'),
@@ -147,7 +147,7 @@ page(
                             ))
                         )
                     ),
-                    formgroup
+                    formGroup
                     (
                         checkbox
                         (
@@ -157,7 +157,7 @@ page(
                     )
                 ),
 
-                formgroup
+                formGroup
                 (
                     set('label', array('text' => $lang->task->desc)),
                     textarea
@@ -170,10 +170,10 @@ page(
                         ))
                     )
                 ),
-                formgroup
+                formGroup
                 (
                     set('label', array('text' => $lang->files)),
-                    formrow
+                    formRow
                     (
                         setClass('items-center'),
                         h::label
@@ -192,10 +192,10 @@ page(
                         span('(不超过50M)')
                     )
                 ),
-                formgroup
+                formGroup
                 (
                     set('label', array('text' => $lang->task->datePlan)),
-                    formrow
+                    formRow
                     (
                         setClass('items-center'),
                         h::date
@@ -211,7 +211,7 @@ page(
                         )
                     )
                 ),
-                formgroup
+                formGroup
                 (
                     set('label', array('text' => $lang->story->mailto)),
                     select
@@ -221,12 +221,12 @@ page(
                         set('items', array_map(function($v, $k) {return array('text' => $v, 'value' => $k, 'selected' => $k === str_replace(' ', '', $task->mailto));}, $users, array_keys($users)))
                     )
                 ),
-                formgroup
+                formGroup
                 (
                     set('label', array('text' => $lang->task->afterSubmit)),
                     setClass('items-center'),
                     setStyle(array('align-items' => 'center')),
-                    formrow
+                    formRow
                     (
                         array_map(function($v, $k) {return radio(
                             set('name', 'after'),
@@ -234,9 +234,9 @@ page(
                         );}, $lang->task->afterChoices, array_keys($lang->task->afterChoices))
                     )
                 ),
-                formgroup
+                formGroup
                 (
-                    formrow
+                    formRow
                     (
                         setClass('justify-center'),
                         btn
diff --git a/module/task/ui/view.html.php b/module/task/ui/view.html.php
index 56eb77d448..7856331cc9 100644
--- a/module/task/ui/view.html.php
+++ b/module/task/ui/view.html.php
@@ -1,7 +1,7 @@
 <?php
 namespace zin;
 
-historyrecord
+historyRecord
 (
     set::actions($actions),
     set::users($users),
diff --git a/zin/func.php b/zin/func.php
index 8c5c0fe6fa..ab01047b4d 100644
--- a/zin/func.php
+++ b/zin/func.php
@@ -18,19 +18,19 @@ require_once __DIR__ . DS . 'zentao' . DS . 'zentao.func.php';
 
 function icon()        {return createWg('icon', func_get_args());}
 function btn()         {return createWg('btn', func_get_args());}
-function pagebase()    {return createWg('pagebase', func_get_args());}
+function pageBase()    {return createWg('pageBase', func_get_args());}
 function page()        {return createWg('page',    func_get_args());}
 function fragment()    {return createWg('fragment',    func_get_args());}
-function btngroup()    {return createWg('btngroup', func_get_args());}
+function btnGroup()    {return createWg('btnGroup', func_get_args());}
 function checkbox()    {return createWg('checkbox', func_get_args());}
-function pagemain()    {return createWg('pagemain', func_get_args());}
-function mainmenu()    {return createWg('mainmenu', func_get_args());}
+function pageMain()    {return createWg('pageMain', func_get_args());}
+function mainMenu()    {return createWg('mainMenu', func_get_args());}
 function row()         {return createWg('row', func_get_args());}
 function col()         {return createWg('col', func_get_args());}
 function column()      {return createWg('column', func_get_args());}
 function center()      {return createWg('center', func_get_args());}
 function cell()        {return createWg('cell', func_get_args());}
-function actionItem()  {return createWg('actionitem', func_get_args());}
+function actionItem()  {return createWg('actionItem', func_get_args());}
 function nav()         {return createWg('nav', func_get_args());}
 function label()       {return createWg('label', func_get_args());}
 function dtable()      {return createWg('dtable', func_get_args());}
@@ -38,39 +38,39 @@ function menu()        {return createWg('menu', func_get_args());}
 function radio()       {return createWg('radio', func_get_args());}
 function switcher()    {return createWg('switcher', func_get_args());}
 function select()      {return createWg('select', func_get_args());}
-function formlabel()   {return createWg('formlabel', func_get_args());}
-function formgroup()   {return createWg('formgroup', func_get_args());}
-function formcell()    {return createWg('formcell', func_get_args());}
-function formgrid()    {return createWg('formgrid', func_get_args());}
-function formrow()     {return createWg('formrow', func_get_args());}
-function forminput()   {return createWg('forminput', func_get_args());}
+function formLabel()   {return createWg('formLabel', func_get_args());}
+function formGroup()   {return createWg('formGroup', func_get_args());}
+function formCell()    {return createWg('formCell', func_get_args());}
+function formGrid()    {return createWg('formGrid', func_get_args());}
+function formRow()     {return createWg('formRow', func_get_args());}
+function formInput()   {return createWg('formInput', func_get_args());}
 function dropdown()    {return createWg('dropdown', func_get_args());}
 function header()      {return createWg('header', func_get_args());}
 function heading()     {return createWg('heading', func_get_args());}
 function navbar()      {return createWg('navbar', func_get_args());}
 function main()        {return createWg('main', func_get_args());}
 function sidebar()     {return createWg('sidebar', func_get_args());}
-function featureBar()  {return createWg('featurebar', func_get_args());}
-function pageheader()  {return createWg('pageheader', func_get_args());}
-function pageheading() {return createWg('pageheading', func_get_args());}
-function pagenavbar()  {return createWg('pagenavbar', func_get_args());}
-function pagetoolbar() {return createWg('pagetoolbar', func_get_args());}
+function featureBar()  {return createWg('featureBar', func_get_args());}
+function pageHeader()  {return createWg('pageHeader', func_get_args());}
+function pageHeading() {return createWg('pageHeading', func_get_args());}
+function pageNavbar()  {return createWg('pageNavbar', func_get_args());}
+function pageToolbar() {return createWg('pageToolbar', func_get_args());}
 function avatar()      {return createWg('avatar', func_get_args());}
-function userAvatar()  {return createWg('useravatar', func_get_args());}
+function userAvatar()  {return createWg('userAvatar', func_get_args());}
 function pager()       {return createWg('pager', func_get_args());}
 function modal()       {return createWg('modal', func_get_args());}
-function modalTrigger(){return createWg('modaltrigger', func_get_args());}
-function modalDialog() {return createWg('modaldialog', func_get_args());}
+function modalTrigger(){return createWg('modalTrigger', func_get_args());}
+function modalDialog() {return createWg('modalDialog', func_get_args());}
 function tabs()        {return createWg('tabs', func_get_args());}
 function panel()       {return createWg('panel', func_get_args());}
 function tooltip()     {return createWg('tooltip', func_get_args());}
-function inputaddon()  {return createWg('inputaddon', func_get_args());}
-function inputgroup()  {return createWg('inputgroup', func_get_args());}
-function inputbtn()    {return createWg('inputbtn', func_get_args());}
+function inputAddon()  {return createWg('inputAddon', func_get_args());}
+function inputGroup()  {return createWg('inputGroup', func_get_args());}
+function inputBtn()    {return createWg('inputBtn', func_get_args());}
 function toolbar()     {return createWg('toolbar', func_get_args());}
-function searchform()  {return createWg('searchform', func_get_args());}
-function searchToggle(){return createWg('searchtoggle', func_get_args());}
-function programmenu() {return createWg('programmenu', func_get_args());}
-function modulemenu()  {return createWg('modulemenu', func_get_args());}
-function assigntodialog() {return createWg('assigntodialog', func_get_args());}
-function historyrecord()  {return createWg('historyrecord', func_get_args());}
+function searchForm()  {return createWg('searchForm', func_get_args());}
+function searchToggle(){return createWg('searchToggle', func_get_args());}
+function programMenu() {return createWg('programMenu', func_get_args());}
+function moduleMenu()  {return createWg('moduleMenu', func_get_args());}
+function assigntoDialog() {return createWg('assigntoDialog', func_get_args());}
+function historyRecord()  {return createWg('historyRecord', func_get_args());}
diff --git a/zin/wg/assigntodialog/v1.php b/zin/wg/assigntodialog/v1.php
index 7709aa9cd0..a542b648ce 100644
--- a/zin/wg/assigntodialog/v1.php
+++ b/zin/wg/assigntodialog/v1.php
@@ -1,7 +1,7 @@
 <?php
 namespace zin;
 
-class assigntodialog extends wg
+class assigntoDialog extends wg
 {
     protected static $defineProps = array
     (
@@ -54,14 +54,14 @@ class assigntodialog extends wg
                     div
                     (
                         setClass('modal-body'),
-                        formgrid
+                        formGrid
                         (
                             set::action($this->prop('action')),
                             set::method('POST'),
-                            formgroup
+                            formGroup
                             (
-                                formlabel($lang->assignedToAB),
-                                formcell
+                                formLabel($lang->assignedToAB),
+                                formCell
                                 (
                                     select
                                     (
@@ -72,15 +72,15 @@ class assigntodialog extends wg
                                 )
                             ),
                             $useLeft === true
-                                ? formgroup
+                                ? formGroup
                                 (
-                                    formlabel($lang->task->left),
-                                    formcell
+                                    formLabel($lang->task->left),
+                                    formCell
                                     (
                                         div
                                         (
                                             setClass('input-control has-suffix'),
-                                            forminput
+                                            formInput
                                             (
                                                 set::type('number'),
                                                 set::min(0),
@@ -97,10 +97,10 @@ class assigntodialog extends wg
                                 )
                                 : null,
                             $useMailto === true
-                                ? formgroup
+                                ? formGroup
                                 (
-                                    formlabel($lang->bug->mailto),
-                                    formcell
+                                    formLabel($lang->bug->mailto),
+                                    formCell
                                     (
                                         select
                                         (
@@ -111,10 +111,10 @@ class assigntodialog extends wg
                                     )
                                 )
                                 : null,
-                            formgroup
+                            formGroup
                             (
-                                formlabel($lang->comment),
-                                formcell
+                                formLabel($lang->comment),
+                                formCell
                                 (
                                     textarea
                                     (
@@ -124,7 +124,7 @@ class assigntodialog extends wg
                                     )
                                 )
                             ),
-                            formgroup
+                            formGroup
                             (
                                 setClass('justify-center'),
                                 button
diff --git a/zin/wg/btngroup/v1.php b/zin/wg/btngroup/v1.php
index 8cd7351137..f98fcefb39 100644
--- a/zin/wg/btngroup/v1.php
+++ b/zin/wg/btngroup/v1.php
@@ -1,7 +1,7 @@
 <?php
 namespace zin;
 
-class btngroup extends wg
+class btnGroup extends wg
 {
     static $defineProps = [
         'items?:array',
@@ -28,6 +28,6 @@ class btngroup extends wg
             );
         }
 
-        return zui::btngroup(inherit($this));
+        return zui::btnGroup(inherit($this));
     }
 }
diff --git a/zin/wg/formcell/v1.php b/zin/wg/formcell/v1.php
index d93ae7dafd..97bf088fb6 100644
--- a/zin/wg/formcell/v1.php
+++ b/zin/wg/formcell/v1.php
@@ -1,7 +1,7 @@
 <?php
 namespace zin;
 
-class formcell extends wg
+class formCell extends wg
 {
     protected function build()
     {
diff --git a/zin/wg/formgrid/v1.php b/zin/wg/formgrid/v1.php
index f8cd00d0f0..726bc03fe8 100644
--- a/zin/wg/formgrid/v1.php
+++ b/zin/wg/formgrid/v1.php
@@ -1,7 +1,7 @@
 <?php
 namespace zin;
 
-class formgrid extends wg
+class formGrid extends wg
 {
     protected function build()
     {
diff --git a/zin/wg/formgroup/v1.php b/zin/wg/formgroup/v1.php
index 6d7b9ce335..72a41be64f 100644
--- a/zin/wg/formgroup/v1.php
+++ b/zin/wg/formgroup/v1.php
@@ -1,7 +1,7 @@
 <?php
 namespace zin;
 
-class formgroup extends wg
+class formGroup extends wg
 {
     protected static $defineProps = 'label?:string';
 
@@ -12,7 +12,7 @@ class formgroup extends wg
         (
             setClass('form-group'),
             set($this->props->skip(array_keys(static::getDefinedProps()))),
-            empty($label) ? null : formlabel(inherit(item(set($label)))),
+            empty($label) ? null : formLabel(inherit(item(set($label)))),
             $this->children()
         );
     }
diff --git a/zin/wg/forminput/v1.php b/zin/wg/forminput/v1.php
index 6fb7c38638..cd19f68d39 100644
--- a/zin/wg/forminput/v1.php
+++ b/zin/wg/forminput/v1.php
@@ -1,7 +1,7 @@
 <?php
 namespace zin;
 
-class forminput extends wg
+class formInput extends wg
 {
     protected function build()
     {
diff --git a/zin/wg/formlabel/v1.php b/zin/wg/formlabel/v1.php
index 72ad6f3afb..622f32bccd 100644
--- a/zin/wg/formlabel/v1.php
+++ b/zin/wg/formlabel/v1.php
@@ -1,7 +1,7 @@
 <?php
 namespace zin;
 
-class formlabel extends wg
+class formLabel extends wg
 {
     protected static $defineProps = 'text?:string,required?:bool,auto?:bool';
 
diff --git a/zin/wg/formrow/v1.php b/zin/wg/formrow/v1.php
index 1c14de260a..377f6fef32 100644
--- a/zin/wg/formrow/v1.php
+++ b/zin/wg/formrow/v1.php
@@ -1,7 +1,7 @@
 <?php
 namespace zin;
 
-class formrow extends wg
+class formRow extends wg
 {
     protected function build()
     {
diff --git a/zin/wg/historyrecord/v1.php b/zin/wg/historyrecord/v1.php
index 27f7954c16..b7c6b742d1 100644
--- a/zin/wg/historyrecord/v1.php
+++ b/zin/wg/historyrecord/v1.php
@@ -1,7 +1,7 @@
 <?php
 namespace zin;
 
-class historyrecord extends wg
+class historyRecord extends wg
 {
     protected static $defineProps = 'actions:array,users:array,methodName:string';
 
diff --git a/zin/wg/inputaddon/v1.php b/zin/wg/inputaddon/v1.php
index ff98b0a507..b89c158445 100644
--- a/zin/wg/inputaddon/v1.php
+++ b/zin/wg/inputaddon/v1.php
@@ -1,7 +1,7 @@
 <?php
 namespace zin;
 
-class inputaddon extends wg
+class inputAddon extends wg
 {
     protected static $defineProps = 'text?:stirng,wg?:array';
 
diff --git a/zin/wg/inputbtn/v1.php b/zin/wg/inputbtn/v1.php
index c496021a9a..7f2b5c4f89 100644
--- a/zin/wg/inputbtn/v1.php
+++ b/zin/wg/inputbtn/v1.php
@@ -1,7 +1,7 @@
 <?php
 namespace zin;
 
-class inputbtn extends wg
+class inputBtn extends wg
 {
     protected static $defineProps = 'wg?:array';
 
diff --git a/zin/wg/inputgroup/v1.php b/zin/wg/inputgroup/v1.php
index 190d46dbca..60ea9e4bbb 100644
--- a/zin/wg/inputgroup/v1.php
+++ b/zin/wg/inputgroup/v1.php
@@ -1,7 +1,7 @@
 <?php
 namespace zin;
 
-class inputgroup extends wg
+class inputGroup extends wg
 {
     protected static $defineProps = 'items?:array';
 
@@ -13,12 +13,12 @@ class inputgroup extends wg
 
         if($type === 'addon')
         {
-            return inputaddon($item);
+            return inputAddon($item);
         }
 
         if($type === 'btn')
         {
-            return inputbtn($item);
+            return inputBtn($item);
         }
 
         if($type === 'input')
diff --git a/zin/wg/mainmenu/v1.php b/zin/wg/mainmenu/v1.php
index 4c8093851f..a4e6fab4f1 100644
--- a/zin/wg/mainmenu/v1.php
+++ b/zin/wg/mainmenu/v1.php
@@ -2,7 +2,7 @@
 
 namespace zin;
 
-class mainmenu extends wg
+class mainMenu extends wg
 {
     static $defineProps = 'statuses?:array,btnGroup?:array,others?:array';
 
diff --git a/zin/wg/modal/v1.php b/zin/wg/modal/v1.php
index 20d623624c..05b510dd28 100644
--- a/zin/wg/modal/v1.php
+++ b/zin/wg/modal/v1.php
@@ -3,7 +3,7 @@ namespace zin;
 
 require_once dirname(__DIR__) . DS . 'modaldialog' . DS . 'v1.php';
 
-class modal extends modaldialog
+class modal extends modalDialog
 {
     static $defineProps = 'id?: string="$GID", modalProps?: array=[]';
 
diff --git a/zin/wg/modulemenu/v1.php b/zin/wg/modulemenu/v1.php
index 7ce1ac9d24..efeb4d0c35 100644
--- a/zin/wg/modulemenu/v1.php
+++ b/zin/wg/modulemenu/v1.php
@@ -1,7 +1,7 @@
 <?php
 namespace zin;
 
-class modulemenu extends wg
+class moduleMenu extends wg
 {
     private $modules = array();
 
diff --git a/zin/wg/page/v1.php b/zin/wg/page/v1.php
index a9add2b39a..55134707a7 100644
--- a/zin/wg/page/v1.php
+++ b/zin/wg/page/v1.php
@@ -5,7 +5,7 @@ require_once dirname(__DIR__) . DS . 'pagebase' . DS . 'v1.php';
 require_once dirname(__DIR__) . DS . 'header' . DS . 'v1.php';
 require_once dirname(__DIR__) . DS . 'main' . DS . 'v1.php';
 
-class page extends pagebase
+class page extends pageBase
 {
     static $defaultProps = array('zui' => true);
 
diff --git a/zin/wg/pagebase/v1.php b/zin/wg/pagebase/v1.php
index a6c50b4074..733007fbcf 100644
--- a/zin/wg/pagebase/v1.php
+++ b/zin/wg/pagebase/v1.php
@@ -1,7 +1,7 @@
 <?php
 namespace zin;
 
-class pagebase extends wg
+class pageBase extends wg
 {
     static $tag = 'html';
 
diff --git a/zin/wg/pageheader/v1.php b/zin/wg/pageheader/v1.php
index f94fb77236..b4e009e260 100644
--- a/zin/wg/pageheader/v1.php
+++ b/zin/wg/pageheader/v1.php
@@ -1,7 +1,7 @@
 <?php
 namespace zin;
 
-class pageheader extends wg
+class pageHeader extends wg
 {
     /**
      * Add child.
@@ -12,19 +12,19 @@ class pageheader extends wg
      */
     protected function onAddChild($child)
     {
-        if(class_exists('zin\pageheading') and $child instanceof pageheading)
+        if(class_exists('zin\pageHeading') and $child instanceof pageHeading)
         {
             $this->add($child, 'heading');
             return false;
         }
 
-        if(class_exists('\zin\pagenavbar') and $child instanceof \zin\pagenavbar)
+        if(class_exists('\zin\pageNavbar') and $child instanceof \zin\pageNavbar)
         {
             $this->add($child, 'navbar');
             return false;
         }
 
-        if(class_exists('\zin\pagetoolbar') and $child instanceof \zin\pagetoolbar)
+        if(class_exists('\zin\pageToolbar') and $child instanceof \zin\pageToolbar)
         {
             $this->add($child, 'toolbar');
             return false;
diff --git a/zin/wg/pageheading/v1.php b/zin/wg/pageheading/v1.php
index 09960483ad..3730b449a2 100644
--- a/zin/wg/pageheading/v1.php
+++ b/zin/wg/pageheading/v1.php
@@ -1,7 +1,7 @@
 <?php
 namespace zin;
 
-class pageheading extends wg
+class pageHeading extends wg
 {
     protected static $defineProps = 'text?:string, icon?:string, url?:string';
 
diff --git a/zin/wg/pagemain/v1.php b/zin/wg/pagemain/v1.php
index d420920f03..3e8450d904 100644
--- a/zin/wg/pagemain/v1.php
+++ b/zin/wg/pagemain/v1.php
@@ -1,7 +1,7 @@
 <?php
 namespace zin;
 
-class pagemain extends wg
+class pageMain extends wg
 {
     protected function build()
     {
diff --git a/zin/wg/pagenavbar/v1.php b/zin/wg/pagenavbar/v1.php
index 9def77cc70..442b99fdf9 100644
--- a/zin/wg/pagenavbar/v1.php
+++ b/zin/wg/pagenavbar/v1.php
@@ -3,6 +3,6 @@ namespace zin;
 
 require_once dirname(__DIR__) . DS . 'nav' . DS . 'v1.php';
 
-class pagenavbar extends nav
+class pageNavbar extends nav
 {
 }
diff --git a/zin/wg/pagetoolbar/v1.php b/zin/wg/pagetoolbar/v1.php
index 9274a67f92..0156c15874 100644
--- a/zin/wg/pagetoolbar/v1.php
+++ b/zin/wg/pagetoolbar/v1.php
@@ -1,7 +1,7 @@
 <?php
 namespace zin;
 
-class pagetoolbar extends wg
+class pageToolbar extends wg
 {
     private function buildGlobalCreate()
     {
diff --git a/zin/wg/programmenu/v1.php b/zin/wg/programmenu/v1.php
index 1d4fc35315..f0bb8782d3 100644
--- a/zin/wg/programmenu/v1.php
+++ b/zin/wg/programmenu/v1.php
@@ -1,7 +1,7 @@
 <?php
 namespace zin;
 
-class programmenu extends wg
+class programMenu extends wg
 {
     private $programs = array();
 
diff --git a/zin/wg/searchform/v1.php b/zin/wg/searchform/v1.php
index d985ed4276..b79570f1e9 100644
--- a/zin/wg/searchform/v1.php
+++ b/zin/wg/searchform/v1.php
@@ -1,7 +1,7 @@
 <?php
 namespace zin;
 
-class searchform extends wg
+class searchForm extends wg
 {
     protected static $defineProps = array
     (
@@ -10,6 +10,6 @@ class searchform extends wg
 
     protected function build()
     {
-        return zui::searchform(inherit($this));
+        return zui::searchForm(inherit($this));
     }
 }