Correct dir and rename