Some code changes, using NameParser.Parse static method