IntegrityError fix

Fix for integrity error when we have in DB Model with the same "name" and different "type"