added wildcard name matching