renaming & reorganizing elements