diff --git a/library/think/Build.php b/library/think/Build.php
index 1285f432..86dd6887 100644
--- a/library/think/Build.php
+++ b/library/think/Build.php
@@ -97,16 +97,17 @@ class Build
             } else {
                 // 生成相关MVC文件
                 foreach ($file as $val) {
-                    $filename  = $modulePath . $path . DS . $val . EXT;
+                    $filename  = $modulePath . $path . DS . $val . (CLASS_APPEND_SUFFIX ? ucfirst($path) : '') . EXT;
                     $namespace = APP_NAMESPACE . '\\' . ($module ? $module . '\\' : '') . $path;
+                    $class     = $val . (CLASS_APPEND_SUFFIX ? ucfirst($path) : '');
                     switch ($path) {
-                        case CONTROLLER_LAYER:    // 控制器
-                            $content = "<?php\nnamespace {$namespace};\n\nclass {$val}\n{\n\n}";
+                        case CONTROLLER_LAYER: // 控制器
+                            $content = "<?php\nnamespace {$namespace};\n\nclass {$class}\n{\n\n}";
                             break;
-                        case MODEL_LAYER:    // 模型
-                            $content = "<?php\nnamespace {$namespace};\n\nuse think\Model;\n\nclass {$val} extends Model\n{\n\n}";
+                        case MODEL_LAYER: // 模型
+                            $content = "<?php\nnamespace {$namespace};\n\nuse think\Model;\n\nclass {$class} extends Model\n{\n\n}";
                             break;
-                        case VIEW_LAYER:    // 视图
+                        case VIEW_LAYER: // 视图
                             $filename = $modulePath . $path . DS . $val . '.html';
                             if (!is_dir(dirname($filename))) {
                                 // 创建目录
@@ -116,7 +117,7 @@ class Build
                             break;
                         default:
                             // 其他文件
-                            $content = "<?php\nnamespace {$namespace};\n\nclass {$val}\n{\n\n}";
+                            $content = "<?php\nnamespace {$namespace};\n\nclass {$class}\n{\n\n}";
                     }
 
                     if (!is_file($filename)) {
@@ -130,10 +131,10 @@ class Build
     // 创建欢迎页面
     protected static function buildHello($module)
     {
-        $filename = APP_PATH . ($module ? $module . DS : '') . CONTROLLER_LAYER . DS . Config::get('default_controller') . EXT;
+        $filename = APP_PATH . ($module ? $module . DS : '') . CONTROLLER_LAYER . DS . Config::get('default_controller') . (CLASS_APPEND_SUFFIX ? ucfirst(CONTROLLER_LAYER) : '') . EXT;
         if (!is_file($filename)) {
             $content = file_get_contents(THINK_PATH . 'tpl' . DS . 'default_index.tpl');
-            $content = str_replace(['{$app}', '{$module}', '{layer}'], [APP_NAMESPACE, $module ? $module . '\\' : '', CONTROLLER_LAYER], $content);
+            $content = str_replace(['{$app}', '{$module}', '{layer}', '{$suffix}'], [APP_NAMESPACE, $module ? $module . '\\' : '', CONTROLLER_LAYER, CLASS_APPEND_SUFFIX ? ucfirst(CONTROLLER_LAYER) : ''], $content);
             if (!is_dir(dirname($filename))) {
                 mkdir(dirname($filename), 0777, true);
             }
diff --git a/tpl/default_index.tpl b/tpl/default_index.tpl
index ad74ac02..eaf37105 100644
--- a/tpl/default_index.tpl
+++ b/tpl/default_index.tpl
@@ -1,7 +1,7 @@
 <?php
 namespace {$app}\{$module}{layer};
 
-class Index
+class Index{$suffix}
 {
     public function index()
     {