Rename some tags with typos or inconsistent spelling

Signed-off-by: Niels Thykier <niels@thykier.net>