Add some comments to the name matching block