The bulk update request #15158 has been approved by @evazion.
rename calvin -> calvin_(calvin_&_hobbes)
rename hobbes -> hobbes_(calvin_&_hobbes)
Both tags are ambiguous, moreso for Calvin.
(For Hobbes at least there is one other character with the same name)