rename & clean