Stick to things' canonical names