updating index names to be shorter and better