Name indexing updates
Merge branch 'master' of github.com:cul/cul_scv_hydra