Auto name resolution added