Fixes #12165 Also changed the index naming convention because some were not properly name and would have caused conflicts in the long run
Fixes #12165 Also changed the index naming convention because some were not properly name and would have caused conflicts in the long run