Fix insertables matching

* Variable names containing hyphen aren't truncated now

Bug: 58746
Change-Id: I292f0ba6195bd3a49408a90284e1c507910c83e5
Merge "Fix insertables matching"