You went from "units" to "unit_criteria". I like the idea of keeping it plural because it feels like it better carries that you're looking at multiple types of units. That's thin though, so feel free to ignore me on this.