[TASK] CleanUp canonicalizing identifiers in FAL-drivers