Fixes #12165 Also changed the index naming convention because some were not properly name and would have caused conflicts in the long run
Fixes https://github.com/twentyhq/core-team-issues/issues/710
Closes https://github.com/twentyhq/core-team-issues/issues/616
Closes https://github.com/twentyhq/core-team-issues/issues/639