Fix another name conflict