Fixed name clash