Enforce optimal index

I forgot whether it's - or _, but I think we agreed at some point to only use one of those everywhere.