Renaming and add index for all declarations