Rename target_path and target_dir to destination_*