refactor naming and cleanly delineate index build scenarios