ObjectName improvements