Change a few tags references to contact