diff --git a/framework-core/pom.xml b/framework-core/pom.xml
index e8557e9..5f34fe1 100644
--- a/framework-core/pom.xml
+++ b/framework-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.unionmed</groupId>
         <artifactId>unionmed-framework</artifactId>
-        <version>0.0.4</version>
+        <version>0.0.5</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/framework-orm/pom.xml b/framework-orm/pom.xml
index 3b15ddb..d0b28a9 100644
--- a/framework-orm/pom.xml
+++ b/framework-orm/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>unionmed-framework</artifactId>
         <groupId>com.unionmed</groupId>
-        <version>0.0.4</version>
+        <version>0.0.5</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/framework-orm/src/main/java/com/unionmed/framework/orm/model/ModelHelper.java b/framework-orm/src/main/java/com/unionmed/framework/orm/model/ModelHelper.java
index bf2555f..7afa353 100644
--- a/framework-orm/src/main/java/com/unionmed/framework/orm/model/ModelHelper.java
+++ b/framework-orm/src/main/java/com/unionmed/framework/orm/model/ModelHelper.java
@@ -44,7 +44,7 @@ public final class ModelHelper {
             table.setId(superTable.getId());
             // field: valid_flag
             table.setValidFlag(superTable.getValidFlag());
-            // others field
+            // other fields
             columns.addAll(superTable.getOtherFields());
         }
 
@@ -154,12 +154,18 @@ public final class ModelHelper {
             sb.append((char) (first + 32));
         }
 
-        String suffix = name.substring(name.length() - modelSuffix.length());
+        String suffix;
+        if (name.endsWith(modelSuffix)) {
+            suffix = name.substring(1, name.length() - modelSuffix.length());
+        } else {
+            suffix = name.substring(1);
+        }
+
         if (ObjectUtils.equals(suffix, modelSuffix)) {
-            name = name.substring(1, name.length() - modelSuffix.length());
+            throw new IllegalArgumentException("illegal table name");
         }
 
-        for (char c : name.toCharArray()) {
+        for (char c : suffix.toCharArray()) {
             if (c >= 65 && c <= 90) {
                 sb.append('_').append((char) (c + 32));
             } else {
diff --git a/framework-test/pom.xml b/framework-test/pom.xml
index b1570f3..6334306 100644
--- a/framework-test/pom.xml
+++ b/framework-test/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.unionmed</groupId>
         <artifactId>unionmed-framework</artifactId>
-        <version>0.0.4</version>
+        <version>0.0.5</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index cf4936a..c4b06b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.unionmed</groupId>
     <artifactId>unionmed-framework</artifactId>
-    <version>0.0.4</version>
+    <version>0.0.5</version>
     <packaging>pom</packaging>
     <name>unionmed-framework</name>