There should be a regression test added for this as it was an issue in bonneville and here. The simplest method is to create a VCH, remove the appliance VM from the inventory, remove the resource pool, then redeploy a new VCH with the same name. That will trigger the folder renamin
From #1351