Add fallback for child name if its nil

If a child was nil no condition would apply in `data_name`. This adds a
fallback to just return `data_token` if all else fails.
Merge pull request #555 from swalkinshaw/add-fallback-for-child-name

Add fallback for child name if its nil