rename & name fix