diff --git a/Model/Behavior/UploadBehavior.php b/Model/Behavior/UploadBehavior.php
index e637612..6cec4b7 100644
--- a/Model/Behavior/UploadBehavior.php
+++ b/Model/Behavior/UploadBehavior.php
@@ -73,7 +73,6 @@ public function setup(Model $model, $config = array()) {
  * @return void
  */
 	protected function _setRelationModel(Model $model, $type) {
-		$type = Inflector::camelize($type);
 		$relation = 'hasOne';
 
 		//case is defined multiple is a hasMany
@@ -81,6 +80,8 @@ protected function _setRelationModel(Model $model, $type) {
 			$relation = 'hasMany';
 		}
 
+		$type = Inflector::camelize($type);
+
 		$model->{$relation}['Attachment' . $type] = array(
 			'className' => 'Attachment',
 			'foreignKey' => 'foreign_key',
@@ -537,6 +538,7 @@ public function saveAttachment(Model $model, $type, $filename, $originalName = n
 					'foreign_key' => $model->id,
 					'model' => $model->alias,
 					'type' => $type,
+					'filename LIKE' => '%' . strtolower(pathinfo($filename, PATHINFO_FILENAME)) . '%'
 				),
 			)
 		);