Fix for instance objects names