Fix naming collision that breaks /over-q42