Fix: Simplify FQCN