Fix for failure to create models having leading/trailing whitespaces in their names