Fix FQCN references