Rename files properly in cloned VM

Changing the logic to be more generic in the way it renames and fixes
up file references in the cloned VM
Properly fix up file names for copied VMs

The fix up names process now properly changes file names.