Fixed lendth of name issues