diff --git a/src/Doctrine/CreateModelCommand.php b/src/Doctrine/CreateModelCommand.php
index 5c43044..fabaa63 100644
--- a/src/Doctrine/CreateModelCommand.php
+++ b/src/Doctrine/CreateModelCommand.php
@@ -176,7 +176,8 @@ public function execute()
 			'[mutators]',
 			'[singular]',
 			'[firstLetter]',
-			'[model]'
+			'[model]',
+			'[table]'
 		);
 
 		$replace = array(
@@ -186,7 +187,8 @@ public function execute()
 			rtrim($mutators),
 			$name,
 			substr($this->_input->getArgument('name'), 0, 1),
-			ucfirst($name)
+			ucfirst($name),
+			$this->_input->getArgument('name')
 		);
 
 		$model = str_replace($search, $replace, $model);
diff --git a/src/Doctrine/Templates/Model.txt b/src/Doctrine/Templates/Model.txt
index 23b6f71..af683f5 100644
--- a/src/Doctrine/Templates/Model.txt
+++ b/src/Doctrine/Templates/Model.txt
@@ -3,7 +3,7 @@
 /**
  * @Entity
  * @Table(
- * 		name="[singular]",
+ * 		name="[table]",
  * 		indexes={
  * 			[indexes]
  * 		}