ALM-657 renamed two indexes for postgres compatibility