Fix for recreating dir structure when an instance is renamed