Fixed name resolution.