Fix issue where instance couldn't be renamed causing it to fail loading
next time