Fix previous fa_ renamings on Windows