Remove "state_" auto-prepend in favor of index