Update names of instances that have been recreated
Adjust whitespace settings to avoid auto-tab creation