Added name+units->lbfc definitions to replace Iris rules matching by name alone.