Err, your statement that any genus name with -oidea should be changed because that's a mandated suffix for superfamilies.