Fix function naming (NFC)