Fixed name conflict