Fixing CNAM lookup and transcriptions