[cleanup] Removed 'index_' from template names/scope reference
Refactor. No functional code change.

Merge branch 'cleanup' into upcoming

* cleanup:
  [cleanup] Removed 'index_' from template names/scope reference