Fixed review comments related to rename option