More name clash fixes