Fixed variable name matching and named index