Rename and add_index