metadata cdv: cleaning up (rename)