Fix issue with objects not accessible after being renamed