Added rename and fixed incorrect pwd.