A fix for the RENAME command to handle targets and ambiguities. Damn I'm