Should also match by variable name