Fixed name resolution problem