use non-snapshot version of name matching

use non-snapshot version of name matching