Swapped in new parseName method.