Change conflicting name (and update website)