Fix identifier to canonical form