rename & cleanup