Index renaming issues, sped up simplify_indexed, used defined NC-objects