Fixed an issue with the name parsing that was causing incorrect listing.
Added a unit test to catch any regressions in this issue.